Skip to content

Commit

Permalink
Add Python 3.8 support
Browse files Browse the repository at this point in the history
Closes #80.
  • Loading branch information
mgedmin committed Oct 31, 2019
1 parent 61792b8 commit 3fa7d44
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ python:
- 2.7
- 3.5
- 3.6
- 3.7
- 3.8
- pypy
- pypy3
matrix:
include:
- python: "3.7"
dist: xenial
sudo: true
install:
- pip install coverage coveralls
- pip install zope.testrunner flake8
Expand Down
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ CHANGES
exceptions for bad HTTP statuses. See `issue 75
<https://zopefoundation/zope.testbrowser/issue/75>`_.

- Add Python 3.8 support. See `issue 80
<https://github.com/zopefoundation/zope.testbrowser/issue/80>`_.


5.3.3 (2019-07-02)
------------------
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Software Development :: Testing',
Expand Down
9 changes: 4 additions & 5 deletions src/zope/testbrowser/browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"""Webtest-based Functional Doctest interfaces
"""

import sys
import re
import time
import io
Expand Down Expand Up @@ -1408,11 +1407,11 @@ class Timer(object):
end_time = 0

def _getTime(self):
if sys.platform.startswith('win'):
# Windows' time.clock gives us high-resolution wall-time
return time.clock()
if hasattr(time, 'perf_counter'):
# Python 3
return time.perf_counter()
else:
# everyone else uses time.time
# Python 2
return time.time()

def start(self):
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ envlist =
py35,
py36,
py37,
py38,
pypy,
pypy3,
docs,
Expand Down Expand Up @@ -35,6 +36,7 @@ depends =
py35,
py36,
py37,
py38,
pypy,
pypy3,

Expand Down

0 comments on commit 3fa7d44

Please sign in to comment.