diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index 05672b980..9148131a4 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -319,7 +319,8 @@ class Glossary(Directive):
 
             defnode = nodes.definition()
             if definition:
-                self.state.nested_parse(definition, definition.items[0][1], defnode)
+                self.state.nested_parse(definition, definition.items[0][1],
+                                        defnode)
 
             items.append((termtexts,
                           nodes.definition_list_item('', term, defnode)))
diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py
index 717848ea1..1263c4116 100644
--- a/sphinx/ext/doctest.py
+++ b/sphinx/ext/doctest.py
@@ -383,7 +383,8 @@ Doctest summary
                     test = parser.get_doctest(code[0].code, {}, group.name,
                                               filename, code[0].lineno)
                 except Exception:
-                    self.warn('ignoring invalid doctest code: %r' % code[0].code,
+                    self.warn('ignoring invalid doctest code: %r' %
+                              code[0].code,
                               '%s:%s' % (filename, code[0].lineno))
                     continue
                 if not test.examples:
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py
index c001b58ca..2a8b2ed2c 100644
--- a/sphinx/setup_command.py
+++ b/sphinx/setup_command.py
@@ -127,7 +127,7 @@ class BuildDoc(Command):
             status_stream = sys.stdout
         confoverrides = {}
         if self.project:
-             confoverrides['project'] = self.project        
+             confoverrides['project'] = self.project
         if self.version:
              confoverrides['version'] = self.version
         if self.release: