Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[py3] Fixed remaining Python 3 syntax errors.

django.utils.unittest.* weren't touched -- they're only imported on Python 2.6.
  • Loading branch information...
commit cacd845996d1245f6aed257bff5f748f46206d3f 1 parent 56dbe92
@aaugustin aaugustin authored
View
2  django/core/management/__init__.py
@@ -324,7 +324,7 @@ def autocomplete(self):
subcommand_cls.option_list]
# filter out previously specified options from available options
prev_opts = [x.split('=')[0] for x in cwords[1:cword-1]]
- options = filter(lambda (x, v): x not in prev_opts, options)
+ options = [opt for opt in options if opt[0] not in prev_opts]
# filter options by current input
options = sorted([(k, v) for k, v in options if k.startswith(curr)])
View
6 django/test/_doctest.py
@@ -105,6 +105,8 @@ def _test():
import warnings
from StringIO import StringIO
+from django.utils import six
+
if sys.platform.startswith('java'):
# On Jython, isclass() reports some modules as classes. Patch it.
def patch_isclass(isclass):
@@ -1232,8 +1234,8 @@ def __run(self, test, compileflags, out):
# keyboard interrupts.)
try:
# Don't blink! This is where the user's code gets run.
- exec compile(example.source, filename, "single",
- compileflags, 1) in test.globs
+ six.exec_(compile(example.source, filename, "single",
+ compileflags, 1), test.globs)
self.debugger.set_continue() # ==== Example Finished ====
exception = None
except KeyboardInterrupt:
View
2  tests/modeltests/select_for_update/tests.py
@@ -206,7 +206,7 @@ def test_block(self):
sanity_count += 1
time.sleep(1)
if sanity_count >= 10:
- raise ValueError, 'Thread did not run and block'
+ raise ValueError('Thread did not run and block')
# Check the person hasn't been updated. Since this isn't
# using FOR UPDATE, it won't block.
View
2  tests/regressiontests/forms/tests/extra.py
@@ -554,7 +554,7 @@ def test_generic_ipaddress_normalization(self):
def test_smart_unicode(self):
class Test:
def __str__(self):
- return b'ŠĐĆŽćžšđ'
+ return 'ŠĐĆŽćžšđ'.encode('utf-8')
class TestU:
def __str__(self):
Please sign in to comment.
Something went wrong with that request. Please try again.