Browse Source

Refs #30160 -- Simplified archive extension map and added other aliases.

Nick Pope 6 years ago
parent
commit
69a30f620e
2 changed files with 7 additions and 9 deletions
  1. 6 8
      django/utils/archive.py
  2. 1 1
      docs/ref/django-admin.txt

+ 6 - 8
django/utils/archive.py

@@ -216,11 +216,9 @@ class ZipArchive(BaseArchive):
         self._archive.close()
 
 
-extension_map = {
-    '.tar': TarArchive,
-    '.tar.bz2': TarArchive,
-    '.tar.gz': TarArchive,
-    '.tgz': TarArchive,
-    '.tz2': TarArchive,
-    '.zip': ZipArchive,
-}
+extension_map = dict.fromkeys((
+    '.tar',
+    '.tar.bz2', '.tbz2', '.tbz', '.tz2',
+    '.tar.gz', '.tgz', '.taz',
+), TarArchive)
+extension_map['.zip'] = ZipArchive

+ 1 - 1
docs/ref/django-admin.txt

@@ -1222,7 +1222,7 @@ For example::
 .. django-admin-option:: --template TEMPLATE
 
 Provides the path to a directory with a custom app template file or a path to a
-compressed file (``.tar.gz``, ``.tar.bz2``, ``.tgz``, ``.tbz``, ``.zip``)
+compressed file (``.tar.gz``, ``.tar.bz2``, ``.tgz``, ``.tbz2``, ``.zip``)
 containing the app template files.
 
 For example, this would look for an app template in the given directory when