pep8 fixes

ci/pep8.sh

 #!/usr/bin/env sh
 . ./ci/config
 
+EXCLUDE=migrations,build,setup,distribute_setup.py,setup.py,rapi.py,dictconfig.py,\
+ordereddict.py
+
 for project in $PROJECTS; do
-  pep8 --exclude=migrations,build $project
+  pep8 --exclude=$EXCLUDE $project
 done

snf-common/docs/conf.py

-import sys, os
+import sys
+import os
 
 sys.path.insert(0, os.path.abspath('../'))
 from synnefo.versions.common import __version__
@@ -15,35 +16,33 @@ master_doc = 'index'
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'
 html_theme = 'default'
-html_theme_options = {
-        'collapsiblesidebar': 'true',
-        'footerbgcolor':    '#55b577',
-        'footertextcolor':  '#000000',
-        'sidebarbgcolor':   '#ffffff',
-        'sidebarbtncolor':  '#f2f2f2',
-        'sidebartextcolor': '#000000',
-        'sidebarlinkcolor': '#328e4a',
-        'relbarbgcolor':    '#55b577',
-        'relbartextcolor':  '#ffffff',
-        'relbarlinkcolor':  '#ffffff',
-        'bgcolor':          '#ffffff',
-        'textcolor':        '#000000',
-        'headbgcolor':      '#ffffff',
-        'headtextcolor':    '#000000',
-        'headlinkcolor':    '#c60f0f',
-        'linkcolor':        '#328e4a',
-        'visitedlinkcolor': '#63409b',
-        'codebgcolor':      '#eeffcc',
-        'codetextcolor':    '#333333'
-}
+html_theme_options = {'collapsiblesidebar': 'true',
+                      'footerbgcolor':    '#55b577',
+                      'footertextcolor':  '#000000',
+                      'sidebarbgcolor':   '#ffffff',
+                      'sidebarbtncolor':  '#f2f2f2',
+                      'sidebartextcolor': '#000000',
+                      'sidebarlinkcolor': '#328e4a',
+                      'relbarbgcolor':    '#55b577',
+                      'relbartextcolor':  '#ffffff',
+                      'relbarlinkcolor':  '#ffffff',
+                      'bgcolor':          '#ffffff',
+                      'textcolor':        '#000000',
+                      'headbgcolor':      '#ffffff',
+                      'headtextcolor':    '#000000',
+                      'headlinkcolor':    '#c60f0f',
+                      'linkcolor':        '#328e4a',
+                      'visitedlinkcolor': '#63409b',
+                      'codebgcolor':      '#eeffcc',
+                      'codetextcolor':    '#333333'}
 
 html_static_path = ['_static']
 htmlhelp_basename = 'synnefodoc'
 
 intersphinx_mapping = {
-        'pithon': ('http://docs.python.org/', None),
-        'django': ('https://docs.djangoproject.com/en/dev/',
-                   'https://docs.djangoproject.com/en/dev/_objects/')
+    'pithon': ('http://docs.python.org/', None),
+    'django': ('https://docs.djangoproject.com/en/dev/',
+               'https://docs.djangoproject.com/en/dev/_objects/')
 }
 
 SYNNEFO_DOCS_BASE_URL = 'http://www.synnefo.org/docs'
@@ -57,9 +56,8 @@ SYNNEFO_PROJECTS = {
 }
 
 for name, ver in SYNNEFO_PROJECTS.iteritems():
-    intersphinx_mapping[name.replace("-","")] = (SYNNEFO_DOCS_BASE_URL +
-                                                 '%s/%s/' % (name, ver),
-                                 None)
+    mapping = (SYNNEFO_DOCS_BASE_URL + '%s/%s/' % (name, ver), None)
+    intersphinx_mapping[name.replace("-", "")] = mapping
 
 extensions = ['sphinx.ext.intersphinx',
               'sphinx.ext.todo',

snf-common/synnefo/lib/context_processors.py

 from django.utils.safestring import mark_safe
 from django.conf import settings
 
+
 def cloudbar(request):
     """
     Django context processor that applies all cloudbar settings in response
@@ -85,4 +86,3 @@ def cloudbar(request):
         'CLOUDBAR_MENU_URL': CB_MENU_URL,
         'CLOUDBAR_CODE': CB_CODE
     }
-

snf-common/synnefo/lib/utils.py

@@ -102,5 +102,3 @@ def dict_merge(a, b):
         else:
             result[k] = copy.deepcopy(v)
     return result
-
-

snf-common/synnefo/versions/__init__.py

@@ -38,4 +38,3 @@ try:
 except ImportError:
     import pkgutil
     __path__ = pkgutil.extend_path(__path__, __name__)
-