diff -r cf70f030a744 Lib/decimal.py --- a/Lib/decimal.py Wed Jun 18 23:07:46 2014 -0400 +++ b/Lib/decimal.py Mon Jun 23 21:48:08 2014 +0300 @@ -6033,7 +6033,10 @@ format_dict['decimal_point'] = '.' # record whether return type should be str or unicode - format_dict['unicode'] = isinstance(format_spec, unicode) + try: + format_dict['unicode'] = isinstance(format_spec, unicode) + except NameError: + format_dict['unicode'] = False return format_dict diff -r cf70f030a744 Lib/test/test_decimal.py --- a/Lib/test/test_decimal.py Wed Jun 18 23:07:46 2014 -0400 +++ b/Lib/test/test_decimal.py Mon Jun 23 21:48:08 2014 +0300 @@ -31,7 +31,7 @@ import unittest from decimal import * import numbers -from test.test_support import (run_unittest, run_doctest, +from test.test_support import (run_unittest, run_doctest, requires_unicode, u, is_resource_enabled, check_py3k_warnings) import random try: @@ -595,11 +595,12 @@ d = nc.create_decimal(prevdec) self.assertEqual(str(d), '5.00E+8') + @requires_unicode def test_unicode_digits(self): test_values = { - u'\uff11': '1', - u'\u0660.\u0660\u0663\u0667\u0662e-\u0663' : '0.0000372', - u'-nan\u0c68\u0c6a\u0c66\u0c66' : '-NaN2400', + u(r'\uff11'): '1', + u(r'\u0660.\u0660\u0663\u0667\u0662e-\u0663') : '0.0000372', + u(r'-nan\u0c68\u0c6a\u0c66\u0c66') : '-NaN2400', } for input, expected in test_values.items(): self.assertEqual(str(Decimal(input)), expected)