Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.2.X] Fixed a Python 2.5 syntax error. Backport of [14983].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit eb7f2789f8e2c9214f0004426270ea8a2589d3e4 1 parent d5c15a4
Alex Gaynor authored December 19, 2010
2  tests/regressiontests/forms/localflavor/utils.py
@@ -20,7 +20,7 @@ def assertFieldOutput(self, fieldclass, valid, invalid, field_args=[],
20 20
             emptyvalue: the expected clean output for inputs in EMPTY_VALUES
21 21
         """
22 22
         required = fieldclass(*field_args, **field_kwargs)
23  
-        optional = fieldclass(*field_args, required=False, **field_kwargs)
  23
+        optional = fieldclass(*field_args, **dict(field_kwargs, required=False))
24 24
         # test valid inputs
25 25
         for input, output in valid.items():
26 26
             self.assertEqual(required.clean(input), output)

0 notes on commit eb7f278

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