[Python-checkins] cpython (merge 3.2 -> default): Issue #1813: merge changeset that reverts a glibc workaround for the

[stefan.krah]

http://hg.python.org/cpython/rev/4244e4348362
changeset:   74723:4244e4348362
parent:      74714:650be5ace87c
parent:      74722:a55ffb6c1993
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Feb 02 16:50:10 2012 +0100
summary:
  Issue #1813: merge changeset that reverts a glibc workaround for the
Fedora buildbot.

files:
  Lib/test/test_locale.py |  3 ---
  1 files changed, 0 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
--- 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 @@
         # 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)

-- 
Repository URL: http://hg.python.org/cpython