summaryrefslogtreecommitdiff
path: root/django/utils/autoreload.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-07-14 21:40:55 +0200
committerClaude Paroz <claude@2xlibre.net>2014-07-15 09:57:54 +0200
commit4e424084e6d796f7ed5f215330cd0b98287c1300 (patch)
tree4130abc5ab02b5de592dba0db2cebfee55179268 /django/utils/autoreload.py
parent5dcdbe95c749d36072f527e120a8cb463199ae0d (diff)
Fixed #22991 -- Prevented *.pyc files in autoreload monitoring
This fixes a regression introduced in 6d302f639. Thanks lorinkoz at gmail.com for the report, Collin Anderson for the initial patch and Simon Charette for the review.
Diffstat (limited to 'django/utils/autoreload.py')
-rw-r--r--django/utils/autoreload.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/django/utils/autoreload.py b/django/utils/autoreload.py
index 72c6065532..3ac8c1fa8e 100644
--- a/django/utils/autoreload.py
+++ b/django/utils/autoreload.py
@@ -99,8 +99,9 @@ def gen_filenames(only_new=False):
return _cached_filenames
new_modules = module_values - _cached_modules
- new_filenames = [filename.__file__ for filename in new_modules
- if hasattr(filename, '__file__')]
+ new_filenames = clean_files(
+ [filename.__file__ for filename in new_modules
+ if hasattr(filename, '__file__')])
if not _cached_filenames and settings.USE_I18N:
# Add the names of the .mo files that can be generated
@@ -119,10 +120,15 @@ def gen_filenames(only_new=False):
if filename.endswith('.mo'):
new_filenames.append(os.path.join(dirpath, filename))
+ _cached_modules = _cached_modules.union(new_modules)
+ _cached_filenames += new_filenames
if only_new:
- filelist = new_filenames
+ return new_filenames
else:
- filelist = _cached_filenames + new_filenames + _error_files
+ return _cached_filenames + clean_files(_error_files)
+
+
+def clean_files(filelist):
filenames = []
for filename in filelist:
if not filename:
@@ -133,8 +139,6 @@ def gen_filenames(only_new=False):
filename = filename[:-9] + ".py"
if os.path.exists(filename):
filenames.append(filename)
- _cached_modules = _cached_modules.union(new_modules)
- _cached_filenames += new_filenames
return filenames