]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#7092: silence some py3k warnings
authorFlorent Xicluna <florent.xicluna@gmail.com>
Fri, 2 Apr 2010 08:30:21 +0000 (08:30 +0000)
committerFlorent Xicluna <florent.xicluna@gmail.com>
Fri, 2 Apr 2010 08:30:21 +0000 (08:30 +0000)
Lib/idlelib/EditorWindow.py
Lib/idlelib/HyperParser.py
Lib/lib-tk/test/test_ttk/test_functions.py
Lib/test/test_bz2.py

index 9ac70ac92a2a1579df935b01eb743498ba6acacd..bdd230b66f634715aa0db0264fb00289e6abe977 100644 (file)
@@ -1194,7 +1194,7 @@ class EditorWindow(object):
             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(
index 94f149673ce874615c412278111f1996fc880542..38a19f2189caff7d24836b4c4f2d5575467c69b4 100644 (file)
@@ -31,7 +31,7 @@ class HyperParser:
         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
index e516fa469897798d961865eb6129cd770912e0ba..f8800ce46204a57af1be88d2dc6832e5a670d3c8 100644 (file)
@@ -72,11 +72,11 @@ class InternalFunctionsTest(unittest.TestCase):
             {'-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
index cbe47fd7b0054858655a65bc7db2abc4a2e9a055..0541535a3c722e14406fbb4770e69f807b34b99d 100644 (file)
@@ -301,11 +301,11 @@ class BZ2FileTest(BaseTest):
             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).