diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-24 13:27:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-24 13:27:53 +0000 |
| commit | d6400802b54b5e9395bbb5ff9dfa3bc2b6bbf246 (patch) | |
| tree | a7f42564c3d263b713c4d5e44fb1d02104cbd41a | |
| parent | 99f9beb1831e4c8a74b230eaa3de6a6b9dc6f249 (diff) | |
| parent | 861670e09194deb58690c32056ba9c67a56b9dd2 (diff) | |
| download | keystone-d6400802b54b5e9395bbb5ff9dfa3bc2b6bbf246.tar.gz keystone-d6400802b54b5e9395bbb5ff9dfa3bc2b6bbf246.tar.xz keystone-d6400802b54b5e9395bbb5ff9dfa3bc2b6bbf246.zip | |
Merge "pep8 1.3.3 cleanup removing unused imports"
| -rw-r--r-- | doc/source/conf.py | 16 | ||||
| -rwxr-xr-x | httpd/keystone.py | 2 | ||||
| -rw-r--r-- | run_tests.py | 2 | ||||
| -rw-r--r-- | tools/install_venv.py | 4 |
4 files changed, 11 insertions, 13 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 881d9add..671bdf35 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -32,7 +32,7 @@ sys.path.insert(0, os.path.abspath('../..')) # 'sphinx.ext.todo', 'sphinx.ext.coverage'] extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', -# 'sphinx.ect.intersphinx', + # 'sphinx.ect.intersphinx', 'sphinx.ext.coverage'] todo_include_todos = True @@ -111,7 +111,7 @@ man_pages = [ [u'OpenStack'], 1), ('man/keystone-all', 'keystone-all', u'Keystone Startup Command', [u'OpenStack'], 1), - ] +] # -- Options for HTML output -------------------------------------------------- @@ -200,14 +200,14 @@ htmlhelp_basename = 'keystonedoc' # -- Options for LaTeX output ------------------------------------------------- latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', + # The paper size ('letterpaper' or 'a4paper'). + #'papersize': 'letterpaper', -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', + # The font size ('10pt', '11pt' or '12pt'). + #'pointsize': '10pt', -# Additional stuff for the LaTeX preamble. -#'preamble': '', + # Additional stuff for the LaTeX preamble. + #'preamble': '', } # Grouping the document tree into LaTeX files. List of tuples (source diff --git a/httpd/keystone.py b/httpd/keystone.py index 24d4a857..bfa06180 100755 --- a/httpd/keystone.py +++ b/httpd/keystone.py @@ -4,8 +4,6 @@ from paste import deploy from keystone import config from keystone.common import logging -from keystone.common import utils -from keystone.common import wsgi LOG = logging.getLogger(__name__) CONF = config.CONF diff --git a/run_tests.py b/run_tests.py index ba9e81a9..0ee8279a 100644 --- a/run_tests.py +++ b/run_tests.py @@ -139,7 +139,7 @@ class _Win32Colorizer(object): 'magenta': red | blue | bold, 'cyan': green | blue | bold, 'white': red | green | blue | bold - } + } def supported(cls, stream=sys.stdout): try: diff --git a/tools/install_venv.py b/tools/install_venv.py index 84b79631..97c82daf 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -62,9 +62,9 @@ def run_command(cmd, redirect_output=True, check_exit_code=True): HAS_EASY_INSTALL = bool(run_command(['which', 'easy_install'], - check_exit_code=False).strip()) + check_exit_code=False).strip()) HAS_VIRTUALENV = bool(run_command(['which', 'virtualenv'], - check_exit_code=False).strip()) + check_exit_code=False).strip()) def check_dependencies(): |