Add Python 3.7 and fix deprecations.

Fixes #10 and fixes #11.

.travis.yml

@@ -7,6 +7,12 @@ python:
     - 3.6
     - pypy
     - pypy3
+matrix:
+    include:
+        - python: "3.7"
+          dist: xenial
+          sudo: true
+
 install:
     - pip install -U pip setuptools
     - pip install -U coverage coveralls

CHANGES.rst

@@ -2,9 +2,11 @@
  CHANGES
 =========
 
-4.2.1 (unreleased)
+4.3.0 (unreleased)
 ==================
 
+- Add support for Python 3.7.
+
 - Host documentation at https://zopesession.readthedocs.io
 
 

setup.py

@@ -56,6 +56,7 @@ def read(*rnames):
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Natural Language :: English',

src/zope/session/http.py

@@ -21,6 +21,14 @@
 from hashlib import sha1
 from email.utils import formatdate
 
+try:
+    # Python 3.3+: OS-independent CPU counter
+    from time import process_time
+except ImportError: # pragma: no cover
+    # Python 2.7
+    from time import clock as process_time
+
+
 from persistent import Persistent
 import zope.location
 from zope import schema
@@ -297,7 +305,7 @@ def generateUniqueId(self):
           True
 
         """
-        data = "%.20f%.20f%.20f" % (random.random(), time.time(), time.clock())
+        data = "%.20f%.20f%.20f" % (random.random(), time.time(), process_time())
         digest = sha1(data.encode()).digest()
         s = digestEncode(digest)
         # we store a HMAC of the random value together with it, which makes

src/zope/session/session.py

@@ -28,7 +28,7 @@
 
 import zope.component
 import zope.interface
-from zope.component.interfaces import ComponentLookupError
+from zope.interface.interfaces import ComponentLookupError
 from zope.publisher.interfaces import IRequest
 
 from zope.session.interfaces import \

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,py36,pypy,pypy3,coverage,docs
+    py27,py34,py35,py36,py37,pypy,pypy3,coverage,docs
 
 [testenv]
 commands =