diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2013-06-03 13:18:16 +0200 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2013-06-03 13:18:16 +0200 |
| commit | c9d07d251fc68fe1a80c2a49e183bbef546238d9 (patch) | |
| tree | 38d62caa3566eb7bf26e87dd881d691818f6a305 /django/utils | |
| parent | 6900cb79dcbc502e0b18476e53ad493b7069ffb8 (diff) | |
Fixed loaddata for Django checkouts with non ASCII chars in the name.
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/_os.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/_os.py b/django/utils/_os.py index 6c1cd17a83..607e02c94d 100644 --- a/django/utils/_os.py +++ b/django/utils/_os.py @@ -38,7 +38,7 @@ def upath(path): """ Always return a unicode path. """ - if not six.PY3: + if not six.PY3 and not isinstance(path, six.text_type): return path.decode(fs_encoding) return path |