[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4
georg.brandl
python-checkins at python.org
Wed Oct 29 08:12:07 CET 2014
https://hg.python.org/cpython/rev/59e487a54da9
changeset: 93218:59e487a54da9
parent: 93216:c9533e4a861c
parent: 93217:b8ebf381390f
user: Georg Brandl <georg at python.org>
date: Wed Oct 29 08:07:50 2014 +0100
summary:
merge with 3.4
files:
Doc/conf.py | 2 +-
Doc/tools/c_annotations.py | 0
Doc/tools/patchlevel.py | 0
Doc/tools/pyspecific.py | 0
Doc/tools/suspicious.py | 2 +-
5 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Doc/conf.py b/Doc/conf.py
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -7,7 +7,7 @@
# that aren't pickleable (module imports are okay, they're removed automatically).
import sys, os, time
-sys.path.append(os.path.abspath('tools'))
+sys.path.append(os.path.abspath('tools/extensions'))
# General configuration
# ---------------------
diff --git a/Doc/tools/c_annotations.py b/Doc/tools/extensions/c_annotations.py
rename from Doc/tools/c_annotations.py
rename to Doc/tools/extensions/c_annotations.py
diff --git a/Doc/tools/patchlevel.py b/Doc/tools/extensions/patchlevel.py
rename from Doc/tools/patchlevel.py
rename to Doc/tools/extensions/patchlevel.py
diff --git a/Doc/tools/pyspecific.py b/Doc/tools/extensions/pyspecific.py
rename from Doc/tools/pyspecific.py
rename to Doc/tools/extensions/pyspecific.py
diff --git a/Doc/tools/suspicious.py b/Doc/tools/extensions/suspicious.py
rename from Doc/tools/suspicious.py
rename to Doc/tools/extensions/suspicious.py
--- a/Doc/tools/suspicious.py
+++ b/Doc/tools/extensions/suspicious.py
@@ -91,7 +91,7 @@
self.log_file_name = os.path.join(self.outdir, 'suspicious.csv')
open(self.log_file_name, 'w').close()
# load database of previously ignored issues
- self.load_rules(os.path.join(os.path.dirname(__file__),
+ self.load_rules(os.path.join(os.path.dirname(__file__), '..',
'susp-ignored.csv'))
def get_outdated_docs(self):
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list