[Python-checkins] r79578 - in python/trunk/Lib: idlelib/EditorWindow.py idlelib/HyperParser.py lib-tk/test/test_ttk/test_functions.py test/test_bz2.py

[florent.xicluna]

Author: florent.xicluna
Date: Fri Apr  2 10:30:21 2010
New Revision: 79578

Log:
#7092: silence some py3k warnings


Modified:
   python/trunk/Lib/idlelib/EditorWindow.py
   python/trunk/Lib/idlelib/HyperParser.py
   python/trunk/Lib/lib-tk/test/test_ttk/test_functions.py
   python/trunk/Lib/test/test_bz2.py

Modified: python/trunk/Lib/idlelib/EditorWindow.py
==============================================================================
--- python/trunk/Lib/idlelib/EditorWindow.py	(original)
+++ python/trunk/Lib/idlelib/EditorWindow.py	Fri Apr  2 10:30:21 2010
@@ -1194,7 +1194,7 @@
             if not self.context_use_ps1:
                 for context in self.num_context_lines:
                     startat = max(lno - context, 1)
-                    startatindex = `startat` + ".0"
+                    startatindex = repr(startat) + ".0"
                     rawtext = text.get(startatindex, "insert")
                     y.set_str(rawtext)
                     bod = y.find_good_parse_start(

Modified: python/trunk/Lib/idlelib/HyperParser.py
==============================================================================
--- python/trunk/Lib/idlelib/HyperParser.py	(original)
+++ python/trunk/Lib/idlelib/HyperParser.py	Fri Apr  2 10:30:21 2010
@@ -31,7 +31,7 @@
         if not editwin.context_use_ps1:
             for context in editwin.num_context_lines:
                 startat = max(lno - context, 1)
-                startatindex = `startat` + ".0"
+                startatindex = repr(startat) + ".0"
                 stopatindex = "%d.end" % lno
                 # We add the newline because PyParse requires a newline at end.
                 # We add a space so that index won't be at end of line, so that

Modified: python/trunk/Lib/lib-tk/test/test_ttk/test_functions.py
==============================================================================
--- python/trunk/Lib/lib-tk/test/test_ttk/test_functions.py	(original)
+++ python/trunk/Lib/lib-tk/test/test_ttk/test_functions.py	Fri Apr  2 10:30:21 2010
@@ -72,11 +72,11 @@
             {'-option': '{one two} three'})
 
         # ignore an option
-        amount_opts = len(ttk._format_optdict(opts, ignore=(u'á'))) / 2
+        amount_opts = len(ttk._format_optdict(opts, ignore=(u'á'))) // 2
         self.assertEqual(amount_opts, len(opts) - 1)
 
         # ignore non-existing options
-        amount_opts = len(ttk._format_optdict(opts, ignore=(u'á', 'b'))) / 2
+        amount_opts = len(ttk._format_optdict(opts, ignore=(u'á', 'b'))) // 2
         self.assertEqual(amount_opts, len(opts) - 1)
 
         # ignore every option

Modified: python/trunk/Lib/test/test_bz2.py
==============================================================================
--- python/trunk/Lib/test/test_bz2.py	(original)
+++ python/trunk/Lib/test/test_bz2.py	Fri Apr  2 10:30:21 2010
@@ -301,11 +301,11 @@
             self.fail("__enter__ on a closed file didn't raise an exception")
         try:
             with BZ2File(self.filename, "wb") as f:
-                1/0
+                1 // 0
         except ZeroDivisionError:
             pass
         else:
-            self.fail("1/0 didn't raise an exception")
+            self.fail("1 // 0 didn't raise an exception")
 
     def testThreading(self):
         # Using a BZ2File from several threads doesn't deadlock (issue #7205).