dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

possibly solved issue 1617? thanks fredcy

Browse Source
This commit is contained in:
mdipierro
2013-08-30 17:38:51 +02:00
committed by Michele Comitini
parent a122215b41
commit b13c2cf6e3
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.08.27.22.25.14 Version 2.6.0-development+timestamp.2013.08.28.09.56.28
gluon/custom_import.py
-4
View File
@@ -119,8 +119,6 @@ class TrackImporter(object):
globals = globals or {} globals = globals or {}
locals = locals or {} locals = locals or {}
fromlist = fromlist or [] fromlist = fromlist or []
if not hasattr(self.THREAD_LOCAL, '_modules_loaded'):
self.THREAD_LOCAL._modules_loaded = set()
try: try:
# Check the date and reload if needed: # Check the date and reload if needed:
self._update_dates(name, globals, locals, fromlist, level) self._update_dates(name, globals, locals, fromlist, level)
@@ -175,7 +173,6 @@ class TrackImporter(object):
if reload_mod or not date or new_date > date: if reload_mod or not date or new_date > date:
self._import_dates[file] = new_date self._import_dates[file] = new_date
if reload_mod or (date and new_date > date): if reload_mod or (date and new_date > date):
if module not in self.THREAD_LOCAL._modules_loaded:
if mod_to_pack: if mod_to_pack:
# Module turning into a package: # Module turning into a package:
mod_name = module.__name__ mod_name = module.__name__
@@ -184,7 +181,6 @@ class TrackImporter(object):
NATIVE_IMPORTER(mod_name, globals, locals, [], level) NATIVE_IMPORTER(mod_name, globals, locals, [], level)
else: else:
reload(module) reload(module)
self.THREAD_LOCAL._modules_loaded.add(module)
def _get_module_file(self, module): def _get_module_file(self, module):
""" """