From 6cb0e3aa2e3d36d683ec63c24a5cbccde52abd23 Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Tue, 28 Feb 2012 22:00:41 -0600 Subject: [PATCH] fix to improved debugger (thanks Mariano) and one in test_languages --- VERSION | 2 +- gluon/languages.py | 2 +- gluon/restricted.py | 1 + gluon/tests/test_languages.py | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 1731c098..55d0853b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.4 (2012-02-28 19:28:53) stable +Version 1.99.4 (2012-02-28 22:00:22) stable diff --git a/gluon/languages.py b/gluon/languages.py index d307e472..07d6afdd 100644 --- a/gluon/languages.py +++ b/gluon/languages.py @@ -51,7 +51,7 @@ def read_dict_aux(filename): logging.error('Syntax error in %s' % filename) return {} -def read_dict(filename): +def read_dict(filename): return getcfs('language:%s'%filename,filename, lambda filename=filename:read_dict_aux(filename)) diff --git a/gluon/restricted.py b/gluon/restricted.py index e7bbecbb..6d4a358b 100644 --- a/gluon/restricted.py +++ b/gluon/restricted.py @@ -196,6 +196,7 @@ def restricted(code, environment=None, layer='Unknown'): """ if environment is None: environment = {} environment['__file__'] = layer + environment['__name__'] = '__restricted__' try: if type(code) == types.CodeType: ccode = code diff --git a/gluon/tests/test_languages.py b/gluon/tests/test_languages.py index 08e2d3ba..7bf30d71 100644 --- a/gluon/tests/test_languages.py +++ b/gluon/tests/test_languages.py @@ -50,8 +50,8 @@ try: readwriters = 10 pool = multiprocessing.Pool(processes = readwriters) results = pool.map(read_write, [[self.filename, 10]] * readwriters) - #for result in results: - # self.assertTrue(result) + for result in results: + self.assertTrue(result) except ImportError: logging.warning("Skipped test case, no multiprocessing module.")