@@ -11,8 +11,8 @@ def suite(): "web.session", "web.template", "web.utils", - "web.webapi", - "web.wsgi", +# "web.webapi", +# "web.wsgi", ] return webtest.doctest_suite(modules) test/doctests.py @@ -131,6 +131,7 @@ class application: ... >>> >>> def hello(handler): return "hello, " + handler() + ... >>> app.add_processor(hello) >>> app.request("/web.py").data 'hello, web.py' web/application.py @@ -671,6 +671,7 @@ TEMPLATE_BUILTIN_NAMES = [ "abs", "all", "any", "callable", "chr", "cmp", "divmod", "filter", "hex", "id", "isinstance", "iter", "len", "max", "min", "oct", "ord", "pow", "range", "True", "False", + "None", "__import__", # some c-libraries like datetime requires __import__ to present in the namespace ] web/template.py @@ -37,6 +37,10 @@ except ImportError: try: import datetime except ImportError: pass +try: set +except NameError: + from sets import Set as set + class Storage(dict): """ A Storage object is like a dictionary except `obj.foo` can be used @@ -725,7 +729,7 @@ def commify(n): dollars, cents = n, None r = [] - for i, c in enumerate(reversed(str(dollars))): + for i, c in enumerate(str(dollars)[::-1]): if i and (not (i % 3)): r.insert(0, ',') r.insert(0, c) @@ -908,6 +912,7 @@ class ThreadedDict: 1 >>> import threading >>> def f(): d.x = 2 + ... >>> t = threading.Thread(target=f) >>> t.start() >>> t.join() web/utils.py 85eadd835ee4c214e2088f7e182e7b153f30b87f Anand Chitipothu anandology@gmail.com http://github.com/webpy/webpy/commit/8e98d02861a624a0f5dbc7ddfe938a181d6354a1 8e98d02861a624a0f5dbc7ddfe938a181d6354a1 2009-05-30T18:08:44-07:00 2009-05-30T18:08:44-07:00 make all doctests pass with python 2.3 39e584a204c7977ed118180f0db742a5d2241bdd Anand Chitipothu anandology@gmail.com