diff --git a/setup.py b/setup.py
index d35c886f1..9872226ee 100644
--- a/setup.py
+++ b/setup.py
@@ -136,7 +136,8 @@ else:
 
                 jscatalog = {}
                 for message in catalog:
-                    if any(x[0].endswith(('.js', '.js_t', '.html')) for x in message.locations):
+                    if any(x[0].endswith(('.js', '.js_t', '.html'))
+                           for x in message.locations):
                         msgid = message.id
                         if isinstance(msgid, (list, tuple)):
                             msgid = msgid[0]
diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
index 906b3c201..c5c8f1519 100644
--- a/sphinx/ext/autosummary/__init__.py
+++ b/sphinx/ext/autosummary/__init__.py
@@ -269,12 +269,14 @@ class Autosummary(Directive):
 
             # try to also get a source code analyzer for attribute docs
             try:
-                documenter.analyzer = ModuleAnalyzer.for_module(documenter.get_real_modname())
+                documenter.analyzer = ModuleAnalyzer.for_module(
+                    documenter.get_real_modname())
                 # parse right now, to get PycodeErrors on parsing (results will
                 # be cached anyway)
                 documenter.analyzer.find_attr_docs()
             except PycodeError, err:
-                documenter.env.app.debug('[autodoc] module analyzer failed: %s', err)
+                documenter.env.app.debug(
+                    '[autodoc] module analyzer failed: %s', err)
                 # no source file -- e.g. for builtin and C modules
                 documenter.analyzer = None