Merge pull request #48 from Kinto/get-rid-of-six

Get rid of six

.travis.yml

@@ -1,7 +1,7 @@
 language: python
-python: 3.5
+python: 3.6
 env:
-    - TOX_ENV=py35
+    - TOX_ENV=py36
     - TOX_ENV=kinto-master
     - TOX_ENV=flake8
 install:
@@ -17,17 +17,13 @@ matrix:
         - pip install tox
         - make install-kinto
         - pip install -U https://github.com/Kinto/kinto/tarball/master
-        - mv kinto_emailer/tests/config/kinto-7.X.ini kinto_emailer/tests/config/kinto.ini
         - make run-kinto &
     - env:
         - TOX_ENV=functional
       install:
         - pip install tox
         - make install-kinto
         - make run-kinto &
-    - python: 3.6
-      env:
-        - TOX_ENV=py36
 after_success:
   # Report coverage results to coveralls.io
   - pip install coveralls

CHANGELOG.rst

@@ -6,7 +6,9 @@ This document describes changes between each past release.
 1.1.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+**Internal changes**
+
+- Get rid of ``six``
 
 
 1.0.1 (2017-11-21)

kinto_emailer/tests/functional.py

@@ -1,11 +1,11 @@
+import configparser
 import os.path
 import shutil
 from glob import glob
-from six.moves.urllib.parse import urljoin
+from urllib.parse import urljoin
 
 import unittest
 import requests
-from six.moves import configparser
 
 from kinto_client import Client
 

kinto_emailer/tests/test_includeme.py

@@ -343,6 +343,7 @@ def get_app_settings(cls, extras=None):
         return settings
 
     def setUp(self):
+        self._patch_autograph()
         collection = {
             'kinto-emailer': {
                 'hooks': [{
@@ -360,11 +361,11 @@ def setUp(self):
         self.app.post_json('/buckets/staging/collections/addons/records',
                            {'data': {'age': 42}},
                            headers=self.headers)
-        self._patch_autograph()
 
     def _patch_autograph(self):
         # Patch calls to Autograph.
         patch = mock.patch('kinto_signer.signer.autograph.requests')
+        self.addCleanup(patch.stop)
         mocked = patch.start()
         mocked.post.return_value.json.return_value = [{
             "signature": "",

requirements.txt

@@ -28,7 +28,6 @@ repoze.lru==0.7
 repoze.sendmail==4.4.1
 requests==2.18.4
 simplejson==3.12.0
-six==1.11.0
 transaction==2.1.2
 translationstring==1.3
 ujson==1.35

setup.py

@@ -33,6 +33,8 @@ def read_file(filename):
       license='Apache License (2.0)',
       classifiers=[
           "Programming Language :: Python",
+          "Programming Language :: Python :: 3",
+          "Programming Language :: Python :: 3.6",
           "Topic :: Internet :: WWW/HTTP",
           "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
           "License :: OSI Approved :: Apache Software License"