drop support for python2.x

platinummonkey · platinummonkey · commit 742d09b9ca11 · 2020-02-23T10:09:59.000-06:00
fixes issue #14
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 python:
-- '2.7'
 - '3.4'
+- '3.7'
 install:
 - pip install -r requirements.pip
 - pip install tox-travis
diff --git a/AUTHORS b/AUTHORS
@@ -1 +1 @@
-Cody Lee <codylee@wellaware.us>
+Cody Lee <cody.lee@datadoghq.com>
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -5,6 +5,11 @@ ChangeLog
 
 Changes to the library are recorded here.
 
+v2.0.0
+------
+  * Fixes issue #14
+  * Drops support for Python 2.x as this is EOL.
+
 v1.2.0
 ------
   * Add custom cert/verification options to be passed normally through the singleton config
diff --git a/docs/index.rst b/docs/index.rst
@@ -13,7 +13,7 @@ Links
 * Official Repository: https://github.com/platinummonkey/python-wiremock.git
 * Package: TODO
 
-wiremock is known to support Python 2.7.
+wiremock is known to support Python 3.7.
 
 
 .. _download:
diff --git a/setup.py b/setup.py
@@ -63,9 +63,9 @@
     test_suite='nose.collector',
     tests_require=develop_requires,
     author='Cody Lee',
-    author_email='codylee@wellaware.us',
+    author_email='cody.lee@datadoghq.com',
     maintainer='Cody Lee',
-    maintainer_email='codylee@wellaware.us',
+    maintainer_email='cody.lee@datadoghq.com',
     url='https://github.com/platinummonkey/python-wiremock',
     license='Apache Software License 2.0',
     packages=find_packages(),
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34}
+envlist = py{34,37}
 
 [testenv]
 whitelist_externals =
diff --git a/wiremock/VERSION b/wiremock/VERSION
@@ -1 +1 @@
-1.2.0
+2.0.0
diff --git a/wiremock/base/base_entity.py b/wiremock/base/base_entity.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from collections import OrderedDict
 import json
 
diff --git a/wiremock/base/base_resource.py b/wiremock/base/base_resource.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 import requests
 from requests import exceptions as rexc
diff --git a/wiremock/constants.py b/wiremock/constants.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from calendar import timegm
 from copy import deepcopy
 import logging
@@ -51,8 +50,8 @@ def datetime_to_ms(dt):
     if isinstance(dt, integer_types):
         return dt
     else:
-        tmp = timegm(date.utctimetuple())
-        tmp += float(date.microsecond) / 1000000.0
+        tmp = timegm(dt.utctimetuple())
+        tmp += float(dt.microsecond) / 1000000.0
         return long_(tmp * 1000.0)
 
 
diff --git a/wiremock/resources/mappings/models.py b/wiremock/resources/mappings/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock._compat import add_metaclass
 from wiremock.base import BaseEntity, JsonProperty, BaseAbstractEntity, BaseEntityMetaType
 
@@ -118,7 +116,6 @@ class DelayDistribution(BaseAbstractEntity):
     upper = JsonProperty('upper')
     lower = JsonProperty('lower')
 
-
 @add_metaclass(BaseEntityMetaType)
 class MappingRequest(BaseAbstractEntity):
     method = JsonProperty('method')
@@ -130,7 +127,7 @@ class MappingRequest(BaseAbstractEntity):
     cookies = JsonProperty('cookies', klass=dict)
     headers = JsonProperty('headers', klass=dict)
     query_parameters = JsonProperty('queryParameters', klass=dict)
-    body_patterns = JsonProperty('bodyPatterns', klass=dict)
+    body_patterns = JsonProperty('bodyPatterns', klass=list, list_klass=dict)
 
 
 @add_metaclass(BaseEntityMetaType)
diff --git a/wiremock/resources/mappings/resource.py b/wiremock/resources/mappings/resource.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock.constants import make_headers
 from wiremock.base.base_resource import BaseResource
 from wiremock.resources.mappings import Mapping, AllMappings, MappingResponse
diff --git a/wiremock/resources/near_misses/models.py b/wiremock/resources/near_misses/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock._compat import add_metaclass
 from wiremock.base import JsonProperty, BaseAbstractEntity, BaseEntityMetaType
 from wiremock.resources.mappings.models import BasicAuthCredentials
diff --git a/wiremock/resources/near_misses/resource.py b/wiremock/resources/near_misses/resource.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock.base.base_resource import BaseResource
 from wiremock.resources.near_misses import NearMissMatchPatternRequest, NearMissMatchRequest, NearMissMatchResponse
 
diff --git a/wiremock/resources/requests/models.py b/wiremock/resources/requests/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock._compat import add_metaclass
 from wiremock.base import BaseEntity, JsonProperty, BaseAbstractEntity, BaseEntityMetaType
 from wiremock.resources.mappings.models import BasicAuthCredentials
diff --git a/wiremock/resources/requests/resource.py b/wiremock/resources/requests/resource.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock.constants import make_headers
 from wiremock.base.base_resource import BaseResource
 from wiremock.resources.requests import RequestCountResponse, RequestResponse, RequestResponseAll, \
diff --git a/wiremock/resources/scenarios/resource.py b/wiremock/resources/scenarios/resource.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock.constants import make_headers
 from wiremock.base.base_resource import BaseResource
 
diff --git a/wiremock/resources/settings/models.py b/wiremock/resources/settings/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock._compat import add_metaclass
 from wiremock.base import JsonProperty, BaseAbstractEntity, BaseEntityMetaType
 
diff --git a/wiremock/resources/settings/resource.py b/wiremock/resources/settings/resource.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock.base.base_resource import BaseResource
 from wiremock.resources.settings import GlobalSetting
 
diff --git a/wiremock/tests/base.py b/wiremock/tests/base.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import json
 import logging
 from nose.tools import nottest
diff --git a/wiremock/tests/resource_tests/mappings_tests/resource_tests.py b/wiremock/tests/resource_tests/mappings_tests/resource_tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import responses
 
 from wiremock.tests.base import BaseClientTestCase, attr
diff --git a/wiremock/tests/resource_tests/mappings_tests/serialization_tests.py b/wiremock/tests/resource_tests/mappings_tests/serialization_tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock.tests.base import BaseClientTestCase, attr
 from wiremock.resources.mappings import BasicAuthCredentials, Mapping, MappingRequest, MappingMeta, MappingResponse, \
     AllMappings, DelayDistribution, DelayDistributionMethods
diff --git a/wiremock/tests/resource_tests/near_misses_tests/resource_tests.py b/wiremock/tests/resource_tests/near_misses_tests/resource_tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import responses
 
 from wiremock.resources.mappings import HttpMethods
diff --git a/wiremock/tests/resource_tests/near_misses_tests/serialization_tests.py b/wiremock/tests/resource_tests/near_misses_tests/serialization_tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock.tests.base import BaseClientTestCase, attr
 from wiremock.resources.mappings import HttpMethods, CommonHeaders, BasicAuthCredentials
 from wiremock.resources.near_misses import NearMissMatchPatternRequest, NearMissMatchResponse, NearMissMatchRequest, \
diff --git a/wiremock/tests/resource_tests/requests_tests/resource_tests.py b/wiremock/tests/resource_tests/requests_tests/resource_tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import responses
 
 from wiremock.resources.near_misses import NearMissMatchRequest
diff --git a/wiremock/tests/resource_tests/requests_tests/serialization_tests.py b/wiremock/tests/resource_tests/requests_tests/serialization_tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock.resources.mappings import BasicAuthCredentials
 from wiremock.tests.base import BaseClientTestCase, attr
 from wiremock.resources.requests import RequestResponse, RequestCountResponse, RequestResponseDefinition, \
diff --git a/wiremock/tests/resource_tests/scenarios_tests/resource_tests.py b/wiremock/tests/resource_tests/scenarios_tests/resource_tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import responses
 
 from wiremock.tests.base import BaseClientTestCase, attr
diff --git a/wiremock/tests/resource_tests/settings_tests/resource_tests.py b/wiremock/tests/resource_tests/settings_tests/resource_tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import responses
 
 from wiremock.tests.base import BaseClientTestCase, attr
diff --git a/wiremock/tests/resource_tests/settings_tests/serialization_tests.py b/wiremock/tests/resource_tests/settings_tests/serialization_tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from wiremock.tests.base import BaseClientTestCase, attr
 from wiremock.resources.settings import GlobalSetting
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Cody Lee <[email protected]>`
	`1`	`+Cody Lee <[email protected]>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import unicode_literals`
`2`	`1`	`from collections import OrderedDict`
`3`	`2`	`import json`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import unicode_literals`
`2`		`-`
`3`	`1`	`import json`
`4`	`2`	`import requests`
`5`	`3`	`from requests import exceptions as rexc`