django1/django/template/loaders
Aymeric Augustin 115318051c [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0.
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py

Backport of 365c3e8b from master.
2013-09-03 07:34:45 -05:00
..
__init__.py MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. 2006-05-02 01:31:56 +00:00
app_directories.py [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0. 2013-09-03 07:34:45 -05:00
cached.py Fixed #19510 -- Race condition in template loading. 2013-03-17 23:56:07 +01:00
eggs.py [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0. 2013-09-03 07:34:45 -05:00
filesystem.py Fixed #19729 -- Removed leftover refactoring helper variables. 2013-02-04 20:31:50 -03:00