Run futurize --stage1

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

check_dns.py

@@ -35,7 +35,7 @@ def check_dns():
                     sitestatus = wordpress
                 else:
                     sitestatus = "Your site appears to be working properly.  Have fun!"
-            except urllib2.HTTPError,e:
+            except urllib2.HTTPError as e:
                 if 'wp-login' in e.geturl():
                     sitestatus = wordpress
                 elif e.code == 404:

scripts/log.py

@@ -53,15 +53,15 @@ def exceptions(func,*args,**kw):
         raise
     except ExpectedException:
         raise
-    except Exception,e:
+    except Exception as e:
         if not getattr(e,'already_syslogged',False):
             from .auth import current_user
             argness = ', '.join(repr(a) for a in args)
             if len(args) > 0 and len(kw) > 0:
                 argness += ', '
             argness += ', '.join('%s=%s'%(k,repr(kw[k])) for k in kw)
             err("%s called %s(%s) but got: %s"
-                % (current_user(),func.func_name,argness,e))
+                % (current_user(),func.__name__,argness,e))
             e.already_syslogged = True
         raise
 

scriptspony/controllers/root.py

@@ -78,7 +78,7 @@ def index(self,locker=None,sudo=False):
             try:
                 hosts = vhosts.list_vhosts(locker)
                 hosts.sort(key=lambda k:k[0])
-            except auth.AuthError,e:
+            except auth.AuthError as e:
                 flash(e.message)
                 # User has been deauthorized from this locker
                 if locker in user_info.lockers:
@@ -108,7 +108,7 @@ def edit(self,locker,hostname,path=None,token=None,alias=''):
             else:
                 try:
                     vhosts.set_path(locker,hostname,path)
-                except vhosts.UserError,e:
+                except vhosts.UserError as e:
                     flash(e.message)
                 else:
                     flash("Host '%s' reconfigured."%hostname)
@@ -121,15 +121,15 @@ def edit(self,locker,hostname,path=None,token=None,alias=''):
                 else:
                     try:
                         vhosts.add_alias(locker,hostname,alias)
-                    except vhosts.UserError,e:
+                    except vhosts.UserError as e:
                         flash(e.message)
                     else:
                         flash("Alias '%s' added to hostname '%s'."
                               % (alias,hostname))
                         redirect('/index/'+locker)
             try:
                 path,aliases=vhosts.get_vhost_info(locker,hostname)
-            except vhosts.UserError,e:
+            except vhosts.UserError as e:
                 flash(e.message)
                 redirect('/index/'+locker)
         return dict(locker=locker, hostname=hostname,
@@ -145,7 +145,7 @@ def delete(self,locker,hostname,confirm=False,token=None):
             else:
                 try:
                     vhosts.delete(locker,hostname)
-                except vhosts.UserError,e:
+                except vhosts.UserError as e:
                     flash(e.message)
                 else:
                     flash("Host '%s' deleted."%hostname)
@@ -154,7 +154,7 @@ def delete(self,locker,hostname,confirm=False,token=None):
         else:
             try:
                 path,aliases=vhosts.get_vhost_info(locker,hostname)
-            except vhosts.UserError,e:
+            except vhosts.UserError as e:
                 flash(e.message)
                 redirect('/index/'+locker)
         return dict(locker=locker, hostname=hostname,
@@ -184,7 +184,7 @@ def new(self,locker,hostname='',path='',desc='',token=None,
                     status = vhosts.request_vhost(locker,hostname,path,
                                                   user=requestor,
                                                   desc=desc)
-                except vhosts.UserError,e:
+                except vhosts.UserError as e:
                     flash(e.message)
                 else:
                     flash(status)
@@ -195,7 +195,7 @@ def new(self,locker,hostname='',path='',desc='',token=None,
         else:
             try:
                 auth.validate_locker(locker,sudo_ok=True)
-            except auth.AuthError,e:
+            except auth.AuthError as e:
                 flash(e.message)
                 redirect('/')
 
@@ -235,7 +235,7 @@ def approve(self,id,subject=None,body=None,token=None,silent=False):
             else:
                 try:
                     vhosts.actually_create_vhost(t.locker,t.hostname,t.path)
-                except vhosts.UserError,e:
+                except vhosts.UserError as e:
                     flash(e.message)
                 else:
                     if not silent:

scriptspony/model/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 """The application's model objects"""
+from __future__ import absolute_import
 
 from zope.sqlalchemy import ZopeTransactionExtension
 from sqlalchemy.orm import scoped_session, sessionmaker
@@ -64,6 +65,6 @@ def init_model(engine):
 elixir.metadata, elixir.session = metadata, DBSession
 
 # Import your model modules here.
-import user
-import queue
+from . import user
+from . import queue
 from scripts.model import meta

scriptspony/websetup.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 """Setup the ScriptsPony application"""
+from __future__ import print_function
 
 import logging
 
@@ -18,9 +19,9 @@ def setup_app(command, conf, vars):
     load_environment(conf.global_conf, conf.local_conf)
     # Load the models
     from scriptspony import model
-    print "Creating tables"
+    print("Creating tables")
     #model.metadata.drop_all(bind=config['tg.app_globals'].sa_engine)
     model.metadata.create_all(bind=config['tg.app_globals'].sa_engine)
 
     transaction.commit()
-    print "Successfully setup"
+    print("Successfully setup")