summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2012-02-02 15:50:10 (GMT)
committerStefan Krah <skrah@bytereef.org>2012-02-02 15:50:10 (GMT)
commitc317a1c185dc31e239d6781553be6bb684434f8d (patch)
treea9f5940c641a5ce9b97e6f95e4ea375d75d3d4ec
parent97e200864575d86516c4dde3ecf6eedf3d534930 (diff)
parent03c29f90c37870d3a0a65524373acb5008fa7a11 (diff)
downloadcpython-c317a1c185dc31e239d6781553be6bb684434f8d.zip
cpython-c317a1c185dc31e239d6781553be6bb684434f8d.tar.gz
cpython-c317a1c185dc31e239d6781553be6bb684434f8d.tar.bz2
Issue #1813: merge changeset that reverts a glibc workaround for the
Fedora buildbot.
-rw-r--r--Lib/test/test_locale.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index 44081b9..7fdb6da 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -1,5 +1,4 @@
from test.support import run_unittest, verbose
-from platform import linux_distribution
import unittest
import locale
import sys
@@ -392,8 +391,6 @@ class TestMiscellaneous(unittest.TestCase):
# crasher from bug #7419
self.assertRaises(locale.Error, locale.setlocale, 12345)
- @unittest.skipIf(linux_distribution()[0] == 'Fedora', "Fedora setlocale() "
- "bug: https://bugzilla.redhat.com/show_bug.cgi?id=726536")
def test_getsetlocale_issue1813(self):
# Issue #1813: setting and getting the locale under a Turkish locale
oldlocale = locale.setlocale(locale.LC_CTYPE)