From: Mike Bayer Date: Sat, 9 Apr 2011 18:56:23 +0000 (-0400) Subject: - adjust this to work normally with current logging approach X-Git-Tag: rel_0_7b4~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b22a2ac97bdb59b8b4afd7c9b0c525e03a8230a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - adjust this to work normally with current logging approach --- diff --git a/doc/build/testdocs.py b/doc/build/testdocs.py index 05c7ac52f9..6aeee488a4 100644 --- a/doc/build/testdocs.py +++ b/doc/build/testdocs.py @@ -8,9 +8,7 @@ import sqlalchemy.util as util import sqlalchemy.log as salog import logging -salog.default_enabled=True -rootlogger = logging.getLogger('sqlalchemy') -rootlogger.setLevel(logging.NOTSET) +rootlogger = logging.getLogger('sqlalchemy.engine.base.Engine') class MyStream(object): def write(self, string): sys.stdout.write(string) @@ -62,10 +60,10 @@ def replace_file(s, newfile): raise ValueError("Couldn't find suitable create_engine call to replace '%s' in it" % oldfile) return s -for filename in ('orm/tutorial', 'core/tutorial'): - filename = '%s.rst' % filename - s = open(filename).read() - #s = replace_file(s, ':memory:') - s = re.sub(r'{(?:stop|sql|opensql)}', '', s) - teststring(s, filename) +for filename in ('orm/tutorial', 'core/tutorial',): + filename = '%s.rst' % filename + s = open(filename).read() + #s = replace_file(s, ':memory:') + s = re.sub(r'{(?:stop|sql|opensql)}', '', s) + teststring(s, filename)