summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorMoritz Sichert <moritz.sichert@googlemail.com>2015-06-13 12:20:05 +0200
committerTim Graham <timograham@gmail.com>2015-06-13 19:45:05 -0400
commit98df288ddaba9787e4a370f12aba51c2b9133142 (patch)
treef4a25f41bd3e18c3078ad010421e8a0d5805ddbe /django/utils
parentd58573e60d7139711e24410741ef508bf0d124d8 (diff)
Fixed #24978 -- Escaped special characters in loaddata fixture paths
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/glob.py36
1 files changed, 36 insertions, 0 deletions
diff --git a/django/utils/glob.py b/django/utils/glob.py
new file mode 100644
index 0000000000..a3138b09dc
--- /dev/null
+++ b/django/utils/glob.py
@@ -0,0 +1,36 @@
+from __future__ import unicode_literals
+
+import os.path
+import re
+
+from django.utils import six
+
+# backport of Python 3.4's glob.escape
+
+try:
+ from glob import escape as glob_escape
+except ImportError:
+ _magic_check = re.compile('([*?[])')
+
+ if six.PY3:
+ _magic_check_bytes = re.compile(b'([*?[])')
+
+ def glob_escape(pathname):
+ """
+ Escape all special characters.
+ """
+ drive, pathname = os.path.splitdrive(pathname)
+ if isinstance(pathname, bytes):
+ pathname = _magic_check_bytes.sub(br'[\1]', pathname)
+ else:
+ pathname = _magic_check.sub(r'[\1]', pathname)
+ return drive + pathname
+
+ else:
+ def glob_escape(pathname):
+ """
+ Escape all special characters.
+ """
+ drive, pathname = os.path.splitdrive(pathname)
+ pathname = _magic_check.sub(r'[\1]', pathname)
+ return drive + pathname