Merge debug print removal with 3.2.

diff --cc Lib/test/test_cmd_line.py
index cc424f6bbec21c8ff9892d038c854de7eca73665,c10bd761ac3baa62cd17978c63ff01dd93e06f52..a89d7e4f1094532cf11f4ed6d497a227d85c82d2
--- 1/Lib/test/test_cmd_line.py
--- 2/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