aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatěj Cepl <mcepl@redhat.com>2011-12-01 01:42:33 +0100
committerMatěj Cepl <mcepl@redhat.com>2011-12-01 01:42:33 +0100
commit3e348dcc926a9169e7c1c37e53b8da10612596aa (patch)
treed0b8ede77ff8e7f2a45775355997a62a9668d2a3
parenta6d7c65d3f731bdcc75c86362b0bb43f8895cd32 (diff)
downloadjson_diff-3e348dcc926a9169e7c1c37e53b8da10612596aa.tar.gz
Fix locale.setlocale to work on RHEL 5.
-rwxr-xr-xjson_diff.py2
-rw-r--r--test_json_diff.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/json_diff.py b/json_diff.py
index e07d598..4f6f495 100755
--- a/json_diff.py
+++ b/json_diff.py
@@ -32,7 +32,7 @@ import logging
from optparse import OptionParser
__author__ = "Matěj Cepl"
-__version__ = "1.2.1"
+__version__ = "1.2.2"
import locale
diff --git a/test_json_diff.py b/test_json_diff.py
index 7fb713a..377a4cf 100644
--- a/test_json_diff.py
+++ b/test_json_diff.py
@@ -197,7 +197,7 @@ class TestMainArgsMgmt(unittest.TestCase):
save_stdout = StringIO()
sys.stdout = save_stdout
cur_loc = locale.getlocale()
- locale.setlocale(locale.LC_ALL, ("cs_CZ", "utf-8"))
+ locale.setlocale(locale.LC_ALL, "cs_CZ.utf8")
res = json_diff.main(["./test_json_diff.py",
"test/old.json", "test/new.json"])