From 4fb02e6900675935e8148850759e9436bfef9663 Mon Sep 17 00:00:00 2001 From: Robin Neatherway Date: Thu, 22 Jun 2017 18:46:30 +0100 Subject: [PATCH 1/6] Declare loop variables to make them local --- sphinx/themes/basic/static/websupport.js | 2 +- sphinx/themes/bizstyle/static/css3-mediaqueries_src.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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]); } From 63d68df1d1d7d61e5e95fe3dacef582c9b07a08c Mon Sep 17 00:00:00 2001 From: Robin Neatherway Date: Fri, 23 Jun 2017 18:10:41 +0100 Subject: [PATCH 2/6] Use NotImplementedError for better exception messages NotImplemented would cause a TypeError --- sphinx/transforms/post_transforms/images.py | 4 ++-- sphinx/util/stemmer/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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): From 4ac0a8e2782c13efc8e84a35f37e123ad02bfdf5 Mon Sep 17 00:00:00 2001 From: Robin Neatherway Date: Fri, 23 Jun 2017 18:27:41 +0100 Subject: [PATCH 3/6] Mark unused loop iteration variable as such --- sphinx/pycode/pgen2/tokenize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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), '') From 71e903635f943cf3ffc05c5014caa3246c446f19 Mon Sep 17 00:00:00 2001 From: Robin Neatherway Date: Fri, 23 Jun 2017 18:28:22 +0100 Subject: [PATCH 4/6] Remove redundant `pass` statement --- sphinx/domains/cpp.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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) From 3be324efb034d3f4d0499754eaf6573c97602a84 Mon Sep 17 00:00:00 2001 From: Robin Neatherway Date: Fri, 23 Jun 2017 18:38:58 +0100 Subject: [PATCH 5/6] Remove impossible condition We have just checked that `descname` is truthy, so it can't possibly be falsy immediately afterwards. --- sphinx/builders/changes.py | 2 -- 1 file changed, 2 deletions(-) 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 = '%s: %s: %s' % (descname, ttext, context) From 3459de0aeb0d1f4dffcd2108bbb9b11e134b6ac3 Mon Sep 17 00:00:00 2001 From: Robin Neatherway Date: Fri, 23 Jun 2017 18:43:11 +0100 Subject: [PATCH 6/6] Use `with` on file write to ensure closure --- sphinx/pycode/pgen2/grammar.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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."""