Modernize Python 2 code to get ready for Python 3

* Use __print()__ function in both Python 2 and Python 3
    * __print()__ is a function in Python 3.
* Old style exceptions --> new style for Python 3
    * Python 3 treats old style exceptions as syntax errors but new style exceptions work as expected in both Python 2 and Python 3.

Author: cclauss

mail_export.py

@@ -12,6 +12,7 @@
 The script needs write permissions in /var/local to save the ID of the
 most recently mailed link. This ID is saved independently per user and tag.
 """
+from __future__ import print_function
 
 import os
 import re
@@ -64,7 +65,7 @@ def get_links(self):
         try:
             posts = json.loads(posts)
         except ValueError:
-            print posts
+            print(posts)
             return []
         return [
             p for p in posts['posts']
@@ -94,7 +95,7 @@ def run(self, options):
         self.latest = max(int(l['id']) for l in links) if not options.dry_run else None
 
         if not self.recipients and not options.full:
-            print body
+            print(body)
             return
 
         msg = MIMEText(body.encode('utf-8'))
@@ -105,7 +106,7 @@ def run(self, options):
             msg['To'] = ', '.join(self.recipients)
 
         if options.full:
-            print msg.as_string()
+            print(msg.as_string())
             return
 
         smtp = smtplib.SMTP(SMTP_SERVER)

oauth.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import sys
 import urlparse
 import oauth2 as oauth
@@ -25,19 +26,19 @@
 
 request_token = dict(urlparse.parse_qsl(content))
 
-print "Request Token:"
-print "    - oauth_token        = %s" % request_token['oauth_token']
-print "    - oauth_token_secret = %s\n" % request_token['oauth_token_secret']
+print("Request Token:")
+print("    - oauth_token        = %s" % request_token['oauth_token'])
+print("    - oauth_token_secret = %s\n" % request_token['oauth_token_secret'])
 
 # Step 2: Redirect to the provider. Since this is a CLI script we do not
 # redirect. In a web application you would redirect the user to the URL
 # below.
 
-print "Go to the following link in your browser:"
-print "%s?%s\n" % (authorize_url, urllib.urlencode({
+print("Go to the following link in your browser:")
+print("%s?%s\n" % (authorize_url, urllib.urlencode({
     "oauth_token": request_token['oauth_token'],
     "oauth_callback": 'http://localhost/doctorstrange'
-}))
+})))
 
 # After the user has granted access to you, the consumer, the provider will
 # redirect you to whatever URL you have told them to redirect to. You can
@@ -61,8 +62,8 @@
 resp, content = client.request(access_token_url, "POST")
 access_token = dict(urlparse.parse_qsl(content))
 
-print "Access Token:"
-print "    - oauth_token        = %s" % access_token['oauth_token']
-print "    - oauth_token_secret = %s" % access_token['oauth_token_secret']
-print
-print "You may now access protected resources using the access tokens above.\n"
+print("Access Token:")
+print("    - oauth_token        = %s" % access_token['oauth_token'])
+print("    - oauth_token_secret = %s" % access_token['oauth_token_secret'])
+print()
+print("You may now access protected resources using the access tokens above.\n")

tumble.py

@@ -117,7 +117,7 @@ def post(self, entry):
             return dict(url=url, entry=entry, data=data)
 
         for k in data:
-            if type(data[k]) is unicode:
+            if isinstance(data[k], unicode):
                 data[k] = data[k].encode('utf-8')
 
         # do the OAuth thing
@@ -127,9 +127,9 @@ def post(self, entry):
         try:
             headers, resp = client.request(url, method='POST', body=urllib.urlencode(data))
             resp = json.loads(resp)
-        except ValueError, e:
+        except ValueError as e:
             return 'error', 'json', resp
-        except EnvironmentError, e:
+        except EnvironmentError as e:
             return 'error', str(e)
         if resp['meta']['status'] in (200, 201):
             return op, str(resp['response']['id'])