openstack/glance
Code Issues Proposed changes

Lock pep8 at v1.1

Browse Source 
Update offending files to pass pep8 v1.1 and lock our deps on this
new version.

Change-Id: I5380f213f8e2f62d75f513c8b4496f78fc692dad
This commit is contained in:
Brian Waldon 2012-05-24 07:16:31 -07:00
parent 9d3fd0598f
commit a7b8e62556
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/common/auth.py
View File

@ -133,7 +133,7 @@ class KeystoneStrategy(BaseStrategy):
# 3. In some configurations nova makes redirection to # 3. In some configurations nova makes redirection to
# v2.0 keystone endpoint. Also, new location does not # v2.0 keystone endpoint. Also, new location does not
# contain real endpoint, only hostname and port. # contain real endpoint, only hostname and port.
if 'v2.0' not in auth_url: if 'v2.0' not in auth_url:
auth_url = urlparse.urljoin(auth_url, 'v2.0/') auth_url = urlparse.urljoin(auth_url, 'v2.0/')
else: else:
# If we sucessfully auth'd, then memorize the correct auth_url # If we sucessfully auth'd, then memorize the correct auth_url

4
glance/common/client.py
View File

@ -599,9 +599,9 @@ class BaseClient(object):
return (e.errno != errno.ESPIPE) return (e.errno != errno.ESPIPE)
def _sendable(self, body): def _sendable(self, body):
return (SENDFILE_SUPPORTED and return (SENDFILE_SUPPORTED and
hasattr(body, 'fileno') and hasattr(body, 'fileno') and
self._seekable(body) and self._seekable(body) and
not self.use_ssl) not self.use_ssl)
def _iterable(self, body): def _iterable(self, body):

2
tools/test-requires
View File

@ -10,6 +10,6 @@ nose
nose-exclude nose-exclude
nosexcover nosexcover
openstack.nose_plugin openstack.nose_plugin
pep8==0.6.1 pep8==1.1
sphinx>=1.1.2 sphinx>=1.1.2
requests requests

2
tox.ini
View File

@ -8,7 +8,7 @@ deps = -r{toxinidir}/tools/pip-requires
commands = {toxinidir}/run_tests.sh -N commands = {toxinidir}/run_tests.sh -N
[testenv:pep8] [testenv:pep8]
deps = pep8==0.6.1 deps = pep8==1.1
commands = pep8 --repeat --show-source bin glance setup.py commands = pep8 --repeat --show-source bin glance setup.py
[testenv:cover] [testenv:cover]