diff --git a/sphinx/builders/changes.py b/sphinx/builders/changes.py
index 5c3072059..a73125e30 100644
--- a/sphinx/builders/changes.py
+++ b/sphinx/builders/changes.py
@@ -73,8 +73,6 @@ class ChangesBuilder(Builder):
             ttext = self.typemap[type]
             context = content.replace('\n', ' ')
             if descname and docname.startswith('c-api'):
-                if not descname:
-                    continue
                 if context:
                     entry = '<b>%s</b>: <i>%s:</i> %s' % (descname, ttext,
                                                           context)
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 70a806ae5..9a4df9e74 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -4673,9 +4673,8 @@ class DefinitionParser(object):
                     else:
                         # For testing purposes.
                         # do it again to get the proper traceback (how do you
-                        # relieable save a traceback when an exception is
+                        # reliably save a traceback when an exception is
                         # constructed?)
-                        pass
                         self.pos = startPos
                         typed = True
                         declSpecs = self._parse_decl_specs(outer=outer, typed=typed)
diff --git a/sphinx/pycode/pgen2/grammar.py b/sphinx/pycode/pgen2/grammar.py
index ac276776e..22d426eec 100644
--- a/sphinx/pycode/pgen2/grammar.py
+++ b/sphinx/pycode/pgen2/grammar.py
@@ -91,9 +91,8 @@ class Grammar(object):
 
     def dump(self, filename):
         """Dump the grammar tables to a pickle file."""
-        f = open(filename, "wb")
-        pickle.dump(self.__dict__, f, 2)
-        f.close()
+        with open(filename, "wb") as f:
+            pickle.dump(self.__dict__, f, 2)
 
     def load(self, filename):
         """Load the grammar tables from a pickle file."""
diff --git a/sphinx/pycode/pgen2/tokenize.py b/sphinx/pycode/pgen2/tokenize.py
index 5f6abdb2f..d2820d23a 100644
--- a/sphinx/pycode/pgen2/tokenize.py
+++ b/sphinx/pycode/pgen2/tokenize.py
@@ -431,7 +431,7 @@ def generate_tokens(readline):
                            (lnum, pos), (lnum, pos+1), line)
                 pos = pos + 1
 
-    for indent in indents[1:]:                 # pop remaining indent levels
+    for _ in indents[1:]:                      # pop remaining indent levels
         yield (DEDENT, '', (lnum, 0), (lnum, 0), '')
     yield (ENDMARKER, '', (lnum, 0), (lnum, 0), '')
 
diff --git a/sphinx/themes/basic/static/websupport.js b/sphinx/themes/basic/static/websupport.js
index 53f6a4525..a95bc3a66 100644
--- a/sphinx/themes/basic/static/websupport.js
+++ b/sphinx/themes/basic/static/websupport.js
@@ -301,7 +301,7 @@
     li.hide();
 
     // Determine where in the parents children list to insert this comment.
-    for(i=0; i < siblings.length; i++) {
+    for(var i=0; i < siblings.length; i++) {
       if (comp(comment, siblings[i]) <= 0) {
         $('#cd' + siblings[i].id)
           .parent()
diff --git a/sphinx/themes/bizstyle/static/css3-mediaqueries_src.js b/sphinx/themes/bizstyle/static/css3-mediaqueries_src.js
index 65b44825d..f21dd4949 100644
--- a/sphinx/themes/bizstyle/static/css3-mediaqueries_src.js
+++ b/sphinx/themes/bizstyle/static/css3-mediaqueries_src.js
@@ -432,7 +432,7 @@ var cssHelper = function () {
 				oss[n][oss[n].length] = r;
 			}
 		};
-		for (i = 0; i < ors.length; i++) {
+		for (var i = 0; i < ors.length; i++) {
 			collectSelectors(ors[i]);
 		}
 
diff --git a/sphinx/transforms/post_transforms/images.py b/sphinx/transforms/post_transforms/images.py
index c57355774..9f07a391f 100644
--- a/sphinx/transforms/post_transforms/images.py
+++ b/sphinx/transforms/post_transforms/images.py
@@ -209,7 +209,7 @@ class ImageConverter(BaseImageConverter):
     def is_available(self):
         # type: () -> bool
         """Confirms the converter is available or not."""
-        raise NotImplemented
+        raise NotImplementedError()
 
     def guess_mimetypes(self, node):
         # type: (nodes.Node) -> List[unicode]
@@ -248,7 +248,7 @@ class ImageConverter(BaseImageConverter):
     def convert(self, _from, _to):
         # type: (unicode, unicode) -> bool
         """Converts the image to expected one."""
-        raise NotImplemented
+        raise NotImplementedError()
 
 
 def setup(app):
diff --git a/sphinx/util/stemmer/__init__.py b/sphinx/util/stemmer/__init__.py
index 6f17d6cdf..a41373a81 100644
--- a/sphinx/util/stemmer/__init__.py
+++ b/sphinx/util/stemmer/__init__.py
@@ -21,7 +21,7 @@ except ImportError:
 class BaseStemmer(object):
     def stem(self, word):
         # type: (unicode) -> unicode
-        raise NotImplemented
+        raise NotImplementedError()
 
 
 class PyStemmer(BaseStemmer):