From 6a8302b5321c7a9e81d9c458fc72f18663e04187 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 13 Jun 2012 10:49:43 -0700
Subject: [PATCH] Fix pep8 issues.

Fix several pep8 issues and pin the pep8 test to pep8 version 1.1.
This should prevent future changes from being unmergable by the pep8
gate after a pep8 upgrade.

Change-Id: I4678a9179579fb5c7afe795fb43a8a89a99ad717
---
 openstackclient/identity/v2_0/endpoint.py | 2 +-
 openstackclient/shell.py                  | 6 +++---
 tox.ini                                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index e22ecd02..c09b479a 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -155,7 +155,7 @@ class ShowEndpoint(command.OpenStackCommand, show.ShowOne):
             '--type',
             metavar='<endpoint-type>',
             default='publicURL',
-            help='Endpoint type: publicURL, internalURL, adminURL ' + \
+            help='Endpoint type: publicURL, internalURL, adminURL ' +
                 '(default publicURL)')
         parser.add_argument(
             '--attr',
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index e29d6382..14b4f80a 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -99,19 +99,19 @@ class OpenStackShell(App):
         parser.add_argument('--os-identity-api-version',
             metavar='<identity-api-version>',
             default=env('OS_IDENTITY_API_VERSION', default='2.0'),
-            help='Identity API version, default=2.0 '\
+            help='Identity API version, default=2.0 '
                                 '(Env: OS_IDENTITY_API_VERSION)')
 
         parser.add_argument('--os-compute-api-version',
             metavar='<compute-api-version>',
             default=env('OS_COMPUTE_API_VERSION', default='2'),
-            help='Compute API version, default=2 '\
+            help='Compute API version, default=2 '
                                 '(Env: OS_COMPUTE_API_VERSION)')
 
         parser.add_argument('--os-image-api-version',
             metavar='<image-api-version>',
             default=env('OS_IMAGE_API_VERSION', default='1.0'),
-            help='Image API version, default=1.0 '\
+            help='Image API version, default=1.0 '
                                 '(Env: OS_IMAGE_API_VERSION)')
 
         parser.add_argument('--os-token', metavar='<token>',
diff --git a/tox.ini b/tox.ini
index 624754bb..f5625341 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ deps = -r{toxinidir}/tools/pip-requires
 commands = nosetests
 
 [testenv:pep8]
-deps = pep8
+deps = pep8==1.1
 commands = pep8 --repeat --show-source openstackclient setup.py
 
 [testenv:venv]