summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-08-05 07:19:35 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-08-05 07:19:35 -0700
commite3433605d77492a58916d2e131eb0701baf849fa (patch)
treec2bf1f2a78c7a30d8d8bb644ad2dc40d4ae4e94f
parent781025f246375c19a4dc663b42551c47d07f701a (diff)
pep8 violations sneaking into trunk?
-rw-r--r--nova/api/direct.py1
-rw-r--r--nova/api/openstack/common.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/direct.py b/nova/api/direct.py
index 139c46d63..fdd2943d2 100644
--- a/nova/api/direct.py
+++ b/nova/api/direct.py
@@ -48,6 +48,7 @@ import nova.api.openstack.wsgi
# Global storage for registering modules.
ROUTES = {}
+
def register_service(path, handle):
"""Register a service handle at a given path.
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 715b9e4a4..75e862630 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -154,7 +154,8 @@ def remove_version_from_href(href):
"""
parsed_url = urlparse.urlsplit(href)
- new_path = re.sub(r'^/v[0-9]+\.[0-9]+(/|$)', r'\1', parsed_url.path, count=1)
+ new_path = re.sub(r'^/v[0-9]+\.[0-9]+(/|$)', r'\1', parsed_url.path,
+ count=1)
if new_path == parsed_url.path:
msg = _('href %s does not contain version') % href