diff options
| author | Georg Brandl <georg@python.org> | 2014-10-29 07:07:50 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-29 07:07:50 (GMT) |
| commit | d51c1a195322e24e86a3c10eaf444a97dbc35b4a (patch) | |
| tree | 0c04ce2b6e42305626ccf260072eb4e6391d125e | |
| parent | fa7a2953cc2260b6f2ffe94955fcddfd83d3595d (diff) | |
| parent | e03902910c70900954572d72997f339a3c1f1154 (diff) | |
| download | cpython-d51c1a195322e24e86a3c10eaf444a97dbc35b4a.zip cpython-d51c1a195322e24e86a3c10eaf444a97dbc35b4a.tar.gz cpython-d51c1a195322e24e86a3c10eaf444a97dbc35b4a.tar.bz2 | |
merge with 3.4
| -rw-r--r-- | Doc/conf.py | 2 | ||||
| -rw-r--r-- | Doc/tools/extensions/c_annotations.py (renamed from Doc/tools/c_annotations.py) | 0 | ||||
| -rw-r--r-- | Doc/tools/extensions/patchlevel.py (renamed from Doc/tools/patchlevel.py) | 0 | ||||
| -rw-r--r-- | Doc/tools/extensions/pyspecific.py (renamed from Doc/tools/pyspecific.py) | 0 | ||||
| -rw-r--r-- | Doc/tools/extensions/suspicious.py (renamed from Doc/tools/suspicious.py) | 2 |
5 files changed, 2 insertions, 2 deletions
diff --git a/Doc/conf.py b/Doc/conf.py index 0c7b601..ff073b1 100644 --- 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 index baa39f3..baa39f3 100644 --- a/Doc/tools/c_annotations.py +++ b/Doc/tools/extensions/c_annotations.py diff --git a/Doc/tools/patchlevel.py b/Doc/tools/extensions/patchlevel.py index bca2eb8..bca2eb8 100644 --- a/Doc/tools/patchlevel.py +++ b/Doc/tools/extensions/patchlevel.py diff --git a/Doc/tools/pyspecific.py b/Doc/tools/extensions/pyspecific.py index 76f6a9f..76f6a9f 100644 --- a/Doc/tools/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py diff --git a/Doc/tools/suspicious.py b/Doc/tools/extensions/suspicious.py index ee87733..d3ed849 100644 --- a/Doc/tools/suspicious.py +++ b/Doc/tools/extensions/suspicious.py @@ -91,7 +91,7 @@ class CheckSuspiciousMarkupBuilder(Builder): 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): |