summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-18 03:12:38 +0000
committerGerrit Code Review <review@openstack.org>2018-04-18 03:12:38 +0000
commitaf6a4cf3a8060732df5f4e06c3b7434c7ea542c9 (patch)
tree30e22d59b0aeda7fed145d0c5e503efc187e7401
parentf28659ae64200f263d220eb741544a61e03b9113 (diff)
parent1b0119797ff3e02cbdc8881d048fe3f676fcd7a2 (diff)
downloaddesignate-af6a4cf3a8060732df5f4e06c3b7434c7ea542c9.tar.gz
Merge "Move pep8 checks to py3 by default"7.0.0.0b1
-rw-r--r--contrib/zoneextractor.py2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/zoneextractor.py b/contrib/zoneextractor.py
index 90fd941a..48e4db5a 100644
--- a/contrib/zoneextractor.py
+++ b/contrib/zoneextractor.py
@@ -39,7 +39,7 @@ class Zone:
self.to_file(sys.stdout)
def to_file(self, f):
- if type(f) is file:
+ if type(f) is 'file':
fd = f
elif type(f) is str:
if os.path.isdir(f):
diff --git a/tox.ini b/tox.ini
index ec0f4aba..40e231e4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -67,7 +67,7 @@ commands = sh tools/pretty_flake8.sh
[testenv:pep8]
deps = -r{toxinidir}/test-requirements.txt
-basepython = python2.7
+basepython = python3
commands = sh tools/pretty_flake8.sh
{[testenv:bandit]commands}
doc8 README.rst releasenotes/source doc/source rally-jobs \