summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-12-19 02:01:01 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-12-19 02:01:01 +0000
commiteb7f2789f8e2c9214f0004426270ea8a2589d3e4 (patch)
tree2c086beb9f419ca89de0b0e3361eb30cb2c3560b
parentd5c15a490e84d858a531e4a79aef49893ce1706a (diff)
[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
-rw-r--r--tests/regressiontests/forms/localflavor/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/regressiontests/forms/localflavor/utils.py b/tests/regressiontests/forms/localflavor/utils.py
index d04c42323e..a10258f24f 100644
--- a/tests/regressiontests/forms/localflavor/utils.py
+++ b/tests/regressiontests/forms/localflavor/utils.py
@@ -20,7 +20,7 @@ class LocalFlavorTestCase(TestCase):
emptyvalue: the expected clean output for inputs in EMPTY_VALUES
"""
required = fieldclass(*field_args, **field_kwargs)
- optional = fieldclass(*field_args, required=False, **field_kwargs)
+ optional = fieldclass(*field_args, **dict(field_kwargs, required=False))
# test valid inputs
for input, output in valid.items():
self.assertEqual(required.clean(input), output)