Merge pull request #1050 from Kinto/remove-py27-support

Remove py27 support

.travis.yml

@@ -1,14 +1,13 @@
 dist: trusty
 language: python
-python: 2.7
+python: 3.5
 cache: pip
 services: redis-server
 addons:
   postgresql: "9.5"
 env:
-  - TOX_ENV=py27
-  - TOX_ENV=py34
-  - TOX_ENV=py27-raw
+  - TOX_ENV=py35
+  - TOX_ENV=py35-raw
   - TOX_ENV=flake8
   - TOX_ENV=docs
 install:
@@ -31,9 +30,3 @@ matrix:
     - python: 3.6
       env:
         - TOX_ENV=py36
-    - env: ACTION=loadtest_tutorial
-      before_script: echo 'Tutorial'
-      script: make loadtest-check-tutorial
-    - env: ACTION=loadtest_simulation
-      before_script: echo 'Simulation'
-      script: make loadtest-check-simulation

CHANGELOG.rst

@@ -8,21 +8,19 @@ This document describes changes between each past release.
 
 **Breaking changes**
 
-- Upgraded to PostgreSQL 9.5  (#1056)
+- Remove Python 2.7 support and upgrade to Python 3.5. (#1050)
+- Upgraded minimal PostgreSQL support to PostgreSQL 9.5 (#1056)
 
 **Bug fixes**
 
-- Prevent injections in the PostgreSQL permission backend. (#1061)
+- Prevent injections in the PostgreSQL permission backend (#1061)
 - Fix crash on ``If-Match: *`` (#1064)
 - Handle Integer overflow in querystring parameters. (#1076)
 
 **Internal changes**
 
 - Update the upsert query to use an INSERT or UPDATE on CONFLICT behavior (fixes #1055)
 - Remove pypy supports. (#1049)
-
-**Internal changes**
-
 - Permission schema children fields are now set during initialization instead of on
   deserialization (#1046).
 - Request schemas (including validation and deserialization) are now isolated by method

Makefile

@@ -1,9 +1,9 @@
 SERVER_CONFIG = config/kinto.ini
 
-VIRTUALENV = virtualenv
+VIRTUALENV = virtualenv --python=python3
 SPHINX_BUILDDIR = docs/_build
 VENV := $(shell echo $${VIRTUAL_ENV-.venv})
-PYTHON = $(VENV)/bin/python
+PYTHON = $(VENV)/bin/python3
 DEV_STAMP = $(VENV)/.dev_env_installed.stamp
 DOC_STAMP = $(VENV)/.doc_env_installed.stamp
 INSTALL_STAMP = $(VENV)/.install.stamp

README.rst

@@ -36,5 +36,5 @@ Kinto is a minimalist JSON storage service with synchronisation and sharing abil
 Requirements
 ------------
 
-* **Python**: 2.7, 3.4+
+* **Python**: 3.5+
 * **Backends**: In-memory (development), Postgresql 9.5+ (production)

docs/api/1.x/collections.rst

@@ -598,14 +598,14 @@ Once a schema has been defined, the posted records must match it:
         "code": 400,
         "details": [
             {
-                "description": "u'title' is a required property",
+                "description": "'title' is a required property",
                 "location": "body",
                 "name": "title"
             }
         ],
         "errno": 107,
         "error": "Invalid parameters",
-        "message": "u'title' is a required property"
+        "message": "'title' is a required property"
     }
 
 

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Kinto documentation build configuration file, created by
 # sphinx-quickstart on Mon Feb  2 15:08:06 2015.
@@ -64,8 +63,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Kinto'
-copyright = u'2015-2017 — Mozilla Services'
+project = 'Kinto'
+copyright = '2015-2017 — Mozilla Services'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -175,8 +174,8 @@ def setup(app):
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    ('index', 'Kinto.tex', u'Kinto Documentation',
-     u'Mozilla Services — Da French Team', 'manual'),
+    ('index', 'Kinto.tex', 'Kinto Documentation',
+     'Mozilla Services — Da French Team', 'manual'),
 ]
 
 
@@ -185,8 +184,8 @@ def setup(app):
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'kinto', u'Kinto Documentation',
-     [u'Mozilla Services — Da French Team'], 1)
+    ('index', 'kinto', 'Kinto Documentation',
+     ['Mozilla Services — Da French Team'], 1)
 ]
 
 
@@ -196,8 +195,8 @@ def setup(app):
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'Kinto', u'Kinto Documentation',
-     u'Mozilla Services — Da French Team', 'Kinto',
+    ('index', 'Kinto', 'Kinto Documentation',
+     'Mozilla Services — Da French Team', 'Kinto',
      'A remote storage service with syncing and sharing abilities.',
      'Miscellaneous'),
 ]

docs/core/notifications.rst

@@ -125,8 +125,8 @@ Example, when deleting a collection with two records:
 ::
 
     >>> event.impacted_records
-    [{'old': {'deleted': True, 'last_modified': 1447240896769, 'id': u'a1f4af60-ddf5-4c49-933f-4cfeff18ad07'}},
-     {'old': {'deleted': True, 'last_modified': 1447240896770, 'id': u'7a6916aa-0ea1-42a7-9741-c24fe13cb70b'}}]
+    [{'old': {'deleted': True, 'last_modified': 1447240896769, 'id': 'a1f4af60-ddf5-4c49-933f-4cfeff18ad07'}},
+     {'old': {'deleted': True, 'last_modified': 1447240896770, 'id': '7a6916aa-0ea1-42a7-9741-c24fe13cb70b'}}]
 
 
 Event listeners

docs/core/permission.rst

@@ -294,15 +294,15 @@ on the resource during registration.
     class MyViewSet(resource.ViewSet):
 
         def get_view_arguments(self, endpoint_type, resource_cls, method):
-            args = super(MyViewSet, self).get_view_arguments(endpoint_type,
+            args = super().get_view_arguments(endpoint_type,
                                                              resource_cls,
                                                              method)
             if method.lower() not in ('get', 'head'):
                 args['permission'] = 'publish'
             return args
 
         def get_service_arguments(self):
-            args = super(MyViewSet, self).get_service_arguments()
+            args = super().get_service_arguments()
             args['factory'] = myapp.MyRootFactory
             return args
 
@@ -323,7 +323,7 @@ For example, a simplistic example with the previous resource viewset:
 
     from pyramid.security import IAuthorizationPolicy
 
-    class MyRootFactory(object):
+    class MyRootFactory:
         def __init__(self, request):
             self.current_resource = None
             service = request.current_service
@@ -332,7 +332,7 @@ For example, a simplistic example with the previous resource viewset:
 
 
     @implementer(IAuthorizationPolicy)
-    class AuthorizationPolicy(object):
+    class AuthorizationPolicy:
         def permits(self, context, principals, permission):
             if context.current_resource == BlogArticle:
                 if permission == 'publish':

docs/core/resource.rst

@@ -34,7 +34,7 @@ Full example
         schema = BookmarkSchema
 
         def process_record(self, new, old=None):
-            new = super(Bookmark, self).process_record(new, old)
+            new = super().process_record(new, old)
             if new['device'] != old['device']:
                 new['device'] = self.request.headers.get('User-Agent')
 
@@ -136,7 +136,7 @@ a custom model can be plugged-in:
 
     class TrackedModel(resource.Model):
         def create_record(self, record, parent_id=None):
-            record = super(TrackedModel, self).create_record(record, parent_id)
+            record = super().create_record(record, parent_id)
             trackid = index.track(record)
             record['trackid'] = trackid
             return record
@@ -241,7 +241,7 @@ or at the resource level:
     @resource.register()
     class Mushroom(resource.UserResource):
         def __init__(request):
-            super(Mushroom, self).__init__(request)
+            super().__init__(request)
             self.model.id_generator = MsecId()
 
 

docs/requirements.txt

@@ -6,5 +6,4 @@ kinto-redis
 mock
 webtest
 cornice
-enum
 pyramid

docs/tutorials/notifications-custom.rst

@@ -321,6 +321,6 @@ But 2 seconds later, look at the worker output:
 
 ::
 
-    {u'resource_name': u'record', u'user_id': u'basicauth:fea1e21d339299506d89e60f048cefd5b424ea641ba48267c35a4ce921439fa4', u'timestamp': 1453459942672, u'uri': u'/buckets/c8c94a74-5bf6-9fb0-5b72-b0777da6718e/collections/assets/records', u'bucket_id': u'c8c94a74-5bf6-9fb0-5b72-b0777da6718e', u'action': u'create', u'collection_id': u'assets'}
+    {'resource_name': 'record', 'user_id': 'basicauth:fea1e21d339299506d89e60f048cefd5b424ea641ba48267c35a4ce921439fa4', 'timestamp': 1453459942672, 'uri': '/buckets/c8c94a74-5bf6-9fb0-5b72-b0777da6718e/collections/assets/records', 'bucket_id': 'c8c94a74-5bf6-9fb0-5b72-b0777da6718e', 'action': 'create', 'collection_id': 'assets'}
 
 It worked!

docs/tutorials/write-plugin.rst

@@ -85,7 +85,7 @@ It is a wrapper basically, and the code is kept simple for the simplicity of thi
 
     import elasticsearch
 
-    class Indexer(object):
+    class Indexer:
         def __init__(self, hosts):
             self.client = elasticsearch.Elasticsearch(hosts)
 

kinto/__main__.py

@@ -4,7 +4,6 @@
 import sys
 import logging
 import logging.config
-from six.moves import input
 
 from kinto.core import scripts
 from pyramid.scripts import pserve
@@ -103,7 +102,7 @@ def main(args=None):
 
     if which_command == 'init':
         if os.path.exists(config_file):
-            print("%s already exists." % config_file, file=sys.stderr)
+            print("{} already exists.".format(config_file), file=sys.stderr)
             return 1
 
         backend = parsed_args['backend']
@@ -150,7 +149,7 @@ def main(args=None):
         pserve_argv = ['pserve', config_file]
         if parsed_args['reload']:
             pserve_argv.append('--reload')
-        pserve_argv.append('http_port=%s' % parsed_args['port'])
+        pserve_argv.append('http_port={}'.format(parsed_args['port']))
         pserve.main(pserve_argv)
 
     elif which_command == 'version':

kinto/authorization.py

@@ -119,8 +119,8 @@ def _relative_object_uri(resource_name, object_uri):
         if resource_name == parent_resource_name:
             return parent_uri
 
-    error_msg = 'Cannot get URL of resource %r from parent %r.'
-    raise ValueError(error_msg % (resource_name, object_uri))
+    error_msg = "Cannot get URL of resource '{}' from parent '{}'."
+    raise ValueError(error_msg.format(resource_name, object_uri))
 
 
 def _inherited_permissions(object_uri, permission):
@@ -142,7 +142,7 @@ def _inherited_permissions(object_uri, permission):
 
     # When requesting permissions for a single object, we check if they are any
     # specific inherited permissions for the attributes.
-    attributes_permission = '%s:attributes' % permission if not plural else permission
+    attributes_permission = '{}:attributes'.format(permission) if not plural else permission
     inherited_perms = object_perms_tree.get(attributes_permission, object_perms_tree[permission])
 
     granters = set()

kinto/config/__init__.py

@@ -21,7 +21,7 @@ def render_template(template, destination, **kwargs):
 
     with codecs.open(template, 'r', encoding='utf-8') as f:
         raw_template = f.read()
-        rendered = raw_template.format(**kwargs)
+        rendered = raw_template.format_map(kwargs)
         with codecs.open(destination, 'w+', encoding='utf-8') as output:
             output.write(rendered)
 
@@ -33,12 +33,11 @@ def init(config_file, backend, host='127.0.0.1'):
     values['secret'] = core_utils.random_bytes_hex(32)
 
     values['kinto_version'] = __version__
-    values['config_file_timestamp'] = core_utils._encoded(
-        strftime('%a, %d %b %Y %H:%M:%S %z'))
+    values['config_file_timestamp'] = str(strftime('%a, %d %b %Y %H:%M:%S %z'))
 
-    values['storage_backend'] = "kinto.core.storage.%s" % backend
-    values['cache_backend'] = "kinto.core.cache.%s" % backend
-    values['permission_backend'] = "kinto.core.permission.%s" % backend
+    values['storage_backend'] = "kinto.core.storage.{}".format(backend)
+    values['cache_backend'] = "kinto.core.cache.{}".format(backend)
+    values['permission_backend'] = "kinto.core.permission.{}".format(backend)
 
     if backend == 'postgresql':
         postgresql_url = "postgres://postgres:postgres@localhost/postgres"

kinto/core/__init__.py

@@ -126,8 +126,8 @@ def includeme(config):
     def add_api_capability(config, identifier, description="", url="", **kw):
         existing = config.registry.api_capabilities.get(identifier)
         if existing:
-            error_msg = "The '%s' API capability was already registered (%s)."
-            raise ValueError(error_msg % (identifier, existing))
+            error_msg = "The '{}' API capability was already registered ({})."
+            raise ValueError(error_msg.format(identifier, existing))
 
         capability = dict(description=description, url=url, **kw)
         config.registry.api_capabilities[identifier] = capability
@@ -174,11 +174,11 @@ def add_api_capability(config, identifier, description="", url="", **kw):
 
     # # Show settings to output.
     # for key, value in settings.items():
-    #     logger.info('Using %s = %s' % (key, value))
+    #     logger.info('Using {} = {}'.format(key, value))
 
     # Scan views.
     config.scan("kinto.core.views")
 
     # Give sign of life.
-    msg = "Running %(project_name)s %(project_version)s."
-    logger.info(msg % settings)
+    msg = "Running {project_name} {project_version}."
+    logger.info(msg.format_map(settings))

kinto/core/authentication.py

@@ -13,9 +13,7 @@ class BasicAuthAuthenticationPolicy(base_auth.BasicAuthAuthenticationPolicy):
     def __init__(self, *args, **kwargs):
         def noop_check(*a):
             return []
-        super(BasicAuthAuthenticationPolicy, self).__init__(noop_check,
-                                                            *args,
-                                                            **kwargs)
+        super().__init__(noop_check, *args, **kwargs)
 
     def effective_principals(self, request):
         # Bypass default Pyramid construction of principals because
@@ -33,7 +31,7 @@ def unauthenticated_userid(self, request):
                 return
 
             hmac_secret = settings['userid_hmac_secret']
-            credentials = '%s:%s' % credentials
+            credentials = '{}:{}'.format(*credentials)
             userid = utils.hmac_digest(hmac_secret, credentials)
             return userid