Start work on fixing issues reported by 2to3

Author: kovidgoyal

examples/forms/example.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import print_function
 import sys
 
 import mechanize
@@ -17,7 +18,7 @@
 # backwards_compat=False)
 # f.close()
 form = forms[0]
-print form  # very useful!
+print(form)  # very useful!
 
 # A 'control' is a graphical HTML form widget: a text entry box, a
 # dropdown 'select' list, a checkbox, etc.
@@ -37,16 +38,16 @@
 # Add files to FILE controls with .add_file().  Only call this multiple
 # times if the server is expecting multiple files.
 #  add a file, default value for MIME type, no filename sent to server
-form.add_file(open("data.dat"))
+form.add_file(open("data.dat", 'rb'))
 #  add a second file, explicitly giving MIME type, and telling the server
 #   what the filename is
-form.add_file(open("data.txt"), "text/plain", "data.txt")
+form.add_file(open("data.txt", 'rb'), "text/plain", "data.txt")
 
 # All Controls may be disabled (equivalent of greyed-out in browser)...
 control = form.find_control("comments")
-print control.disabled
+print(control.disabled)
 #  ...or readonly
-print control.readonly
+print(control.readonly)
 #  readonly and disabled attributes can be assigned to
 control.disabled = False
 #  convenience method, used here to make all controls writable (unless
@@ -80,11 +81,11 @@
 
 # You can get the Control instances from inside the form...
 control = form.find_control("cheeses", type="select")
-print control.name, control.value, control.type
+print(control.name, control.value, control.type)
 control.value = ["mascarpone", "curd"]
 # ...and the Item instances from inside the Control
 item = control.get("curd")
-print item.name, item.selected, item.id, item.attrs
+print(item.name, item.selected, item.id, item.attrs)
 item.selected = False
 
 # Controls may be referred to by label:
@@ -126,7 +127,7 @@ def control_has_caerphilly(control):
 
 # Control.items is a list of all Item instances in the control
 for item in form.find_control("cheeses").items:
-    print item.name
+    print(item.name)
 
 # To remove items from a list control, remove it from .items:
 cheeses = form.find_control("cheeses")
@@ -151,13 +152,13 @@ def control_has_caerphilly(control):
 # Which items are present, selected, and successful?
 #  is the "parmesan" item of the "cheeses" control successful (selected
 #   and not disabled)?
-print "parmesan" in form["cheeses"]
+print("parmesan" in form["cheeses"])
 #  is the "parmesan" item of the "cheeses" control selected?
-print "parmesan" in [
-    item.name for item in form.find_control("cheeses").items if item.selected]
+print("parmesan" in [
+    item.name for item in form.find_control("cheeses").items if item.selected])
 #  does cheeses control have a "caerphilly" item?
-print "caerphilly" in [
-    item.name for item in form.find_control("cheeses").items]
+print("caerphilly" in [
+    item.name for item in form.find_control("cheeses").items])
 
 # Sometimes one wants to set or clear individual items in a list, rather
 # than setting the whole .value:
@@ -179,21 +180,21 @@ def control_has_caerphilly(control):
 # Items may be disabled (selecting or de-selecting a disabled item is
 # not allowed):
 control = form.find_control("cheeses")
-print control.get("emmenthal").disabled
+print(control.get("emmenthal").disabled)
 control.get("emmenthal").disabled = True
 #  enable all items in control
 control.set_all_items_disabled(False)
 
 request2 = form.click()  # mechanize.Request object
 try:
     response2 = mechanize.urlopen(request2)
-except mechanize.HTTPError, response2:
+except mechanize.HTTPError as response2:
     pass
 
-print response2.geturl()
+print(response2.geturl())
 # headers
-for name, value in response2.info().items():
+for name, value in list(response2.info().items()):
     if name != "date":
-        print "%s: %s" % (name.title(), value)
-print response2.read()  # body
+        print("%s: %s" % (name.title(), value))
+print(response2.read())  # body
 response2.close()

examples/forms/simple.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import print_function
 import sys
 
 from mechanize import Browser, urljoin, urlopen

examples/hack21.py

@@ -1,17 +1,17 @@
-#/usr/bin/env python
+#!/usr/bin/env python
 
 # Port of Hack 21 from the O'Reilly book "Spidering Hacks" by Tara
 # Calishain and Kevin Hemenway.  Of course, there's no need to explicitly
 # catch exceptions in Python, unlike checking error return values in Perl,
 # but I've left those in for the sake of a direct port.
 
+from __future__ import print_function
 import sys
 import os
 import re
-from urllib2 import HTTPError
 
 import mechanize
-assert mechanize.__version__ >= (0, 0, 6, "a")
+from mechanize.polyglot import HTTPError
 
 mech = mechanize.Browser()
 # Addition 2005-01-05: Be naughty, since robots.txt asks not to
@@ -44,20 +44,20 @@
 # Get all the tarballs
 urls = [link.absolute_url for link in
         mech.links(url_regex=re.compile(r"\.tar\.gz$"))]
-print "Found", len(urls), "tarballs to download"
+print("Found", len(urls), "tarballs to download")
 
 if "--all" not in sys.argv[1:]:
     urls = urls[:1]
 
 for url in urls:
     filename = os.path.basename(url)
     f = open(filename, "wb")
-    print "%s -->" % filename,
+    print("%s -->" % filename, end=' ')
     r = mech.open(url)
     while 1:
         data = r.read(1024)
         if not data:
             break
         f.write(data)
     f.close()
-    print os.stat(filename).st_size, "bytes"
+    print(os.stat(filename).st_size, "bytes")

examples/pypi.py

@@ -7,9 +7,9 @@
 
 import sys
 import os
-import urlparse
 
 import mechanize
+from mechanize.polyglot import urlsplit
 
 
 def download_mechanize():
@@ -22,7 +22,7 @@ def download_mechanize():
     browser.submit()
     browser.follow_link(text_regex="mechanize-?(.*)")
     link = browser.find_link(text_regex=r"\.tar\.gz")
-    filename = os.path.basename(urlparse.urlsplit(link.url)[2])
+    filename = os.path.basename(urlsplit(link.url)[2])
     if os.path.exists(filename):
         sys.exit("%s already exists, not grabbing" % filename)
     browser.retrieve(link.url, filename)

mechanize/polyglot.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python2
+# vim:fileencoding=utf-8
+# License: GPLv3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
+
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+
+import sys
+
+is_py2 = sys.version_info.major < 3
+
+if is_py2:
+    from urllib2 import HTTPError
+    from urlparse import urlsplit
+else:
+    from urllib.error import HTTPError
+    from urllib.parse import urlsplit
+if False:
+    HTTPError, urlsplit

publish.py

@@ -58,12 +58,18 @@ def upload_release():
         os.path.join(os.environ['PENV'], 'pypi'), *files)
 
 
+try:
+    myinput = raw_input
+except NameError:
+    myinput = input
+
+
 def main():
-    if raw_input('Publish version {} [y/n]? '.format(red(VERSION))) != 'y':
+    if myinput('Publish version {} [y/n]? '.format(red(VERSION))) != 'y':
         raise SystemExit(1)
     build_release()
     sign_release()
-    if raw_input(red('Upload') + ' release [y/n]? ') != 'y':
+    if myinput(red('Upload') + ' release [y/n]? ') != 'y':
         raise SystemExit(1)
     tag_release()
     upload_release()