Georg Brandl avatar Georg Brandl committed 7aecf2b Merge

merge with 0.6

Comments (0)

Files changed (1)

sphinx/pycode/__init__.py

         self.srcname = srcname
         # file-like object yielding source lines
         self.source = source
+        # will be changed when found by parse()
+        self.encoding = sys.getdefaultencoding()
 
         # cache the source code as well
         pos = self.source.tell()
             self.parsetree = pydriver.parse_tokens(self.tokens)
         except parse.ParseError, err:
             raise PycodeError('parsing failed', err)
-        # find the source code encoding
-        encoding = sys.getdefaultencoding()
+        # find the source code encoding, if present
         comments = self.parsetree.get_prefix()
         for line in comments.splitlines()[:2]:
             match = _coding_re.search(line)
             if match is not None:
-                encoding = match.group(1)
+                self.encoding = match.group(1)
                 break
-        self.encoding = encoding
 
     def find_attr_docs(self, scope=''):
         """Find class and module-level attributes and their documentation."""
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.