Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[py3] abspathu doesn't exist under Python 3.

  • Loading branch information...
commit a4abe7ed56d44418c8203b4605085caf9b349654 1 parent 50c41e7
@aaugustin aaugustin authored
Showing with 7 additions and 7 deletions.
  1. +7 −7 django/utils/_os.py
View
14 django/utils/_os.py
@@ -2,6 +2,7 @@
import stat
from os.path import join, normcase, normpath, abspath, isabs, sep
from django.utils.encoding import force_text
+from django.utils import six
try:
WindowsError = WindowsError
@@ -10,13 +11,12 @@ class WindowsError(Exception):
pass
-# Define our own abspath function that can handle joining
-# unicode paths to a current working directory that has non-ASCII
-# characters in it. This isn't necessary on Windows since the
-# Windows version of abspath handles this correctly. The Windows
-# abspath also handles drive letters differently than the pure
-# Python implementation, so it's best not to replace it.
-if os.name == 'nt':
+# Under Python 2, define our own abspath function that can handle joining
+# unicode paths to a current working directory that has non-ASCII characters
+# in it. This isn't necessary on Windows since the Windows version of abspath
+# handles this correctly. It also handles drive letters differently than the
+# pure Python implementation, so it's best not to replace it.
+if six.PY3 or os.name == 'nt':
abspathu = abspath
else:
def abspathu(path):

0 comments on commit a4abe7e

Please sign in to comment.
Something went wrong with that request. Please try again.