From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 23 Nov 2012 20:16:45 +0000 (+0200)
Subject: Merge debug print removal with 3.2.
X-Git-Tag: v3.3.1rc1~599
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ab09d129e7908d58f8141cbf0ef824c1037a7e4;p=python

Merge debug print removal with 3.2.
---

9ab09d129e7908d58f8141cbf0ef824c1037a7e4
diff --cc Lib/test/test_cmd_line.py
index cc424f6bbe,c10bd761ac..a89d7e4f10
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@@ -94,15 -100,11 +94,11 @@@ class CmdLineTest(unittest.TestCase)
          # All good if execution is successful
          assert_python_ok('-c', 'pass')
  
 -    @unittest.skipIf(sys.getfilesystemencoding() == 'ascii',
 -                     'need a filesystem encoding different than ASCII')
 +    @unittest.skipUnless(test.support.FS_NONASCII, 'need support.FS_NONASCII')
      def test_non_ascii(self):
          # Test handling of non-ascii data
-         if test.support.verbose:
-             import locale
-             print('locale encoding = %s, filesystem encoding = %s'
-                   % (locale.getpreferredencoding(), sys.getfilesystemencoding()))
 -        command = "assert(ord('\xe9') == 0xe9)"
 +        command = ("assert(ord(%r) == %s)"
 +                   % (test.support.FS_NONASCII, ord(test.support.FS_NONASCII)))
          assert_python_ok('-c', command)
  
      # On Windows, pass bytes to subprocess doesn't test how Python decodes the