From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 19 Apr 2010 11:50:08 +0000 (+0000)
Subject: Fix r80180 (backport of r80178): SkipTest => unittest.SkipTest in test_locale
X-Git-Tag: v2.6.6rc1~442
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2028797accd678e7957fc72e448e212fc414188;p=thirdparty%2FPython%2Fcpython.git

Fix r80180 (backport of r80178): SkipTest => unittest.SkipTest in test_locale

The original commit (r80178) was correct. The bug was introduced during the
backport, funny :-)
---

diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index c05776790078..9528d45157c9 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -16,7 +16,7 @@ def get_enUS_locale():
             # The locale test work fine on OSX 10.6, I (ronaldoussoren)
             # haven't had time yet to verify if tests work on OSX 10.5
             # (10.4 is known to be bad)
-            raise SkipTest("Locale support on MacOSX is minimal")
+            raise unittest.SkipTest("Locale support on MacOSX is minimal")
     if sys.platform.startswith("win"):
         tlocs = ("En", "English")
     else: