Commits

Georg Brandl committed ce1ad18 Merge

Merge with 1.0

  • Participants
  • Parent commits bd9ed14, d37320b

Comments (0)

Files changed (2)

sphinx/environment.py

             config.exclude_trees +
             [d + config.source_suffix for d in config.unused_docs] +
             ['**/' + d for d in config.exclude_dirnames] +
-            ['**/_sources']
+            ['**/_sources', '.#*']
         )
         self.found_docs = set(get_matching_docs(
             self.srcdir, config.source_suffix, exclude_matchers=matchers))

sphinx/util/__init__.py

     lfilename = filename.lower()
     if lfilename.endswith('.pyo') or lfilename.endswith('.pyc'):
         filename = filename[:-1]
+        if not path.isfile(filename) and path.isfile(filename + 'w'):
+            filename += 'w'
     elif not (lfilename.endswith('.py') or lfilename.endswith('.pyw')):
         raise PycodeError('source is not a .py file: %r' % filename)
     if not path.isfile(filename):