Update for python3

Author: achernya

database.py

@@ -5,8 +5,9 @@
 """
 
 import sqlalchemy
-import sqlalchemy.orm
 import sqlalchemy.ext.declarative
+import sqlalchemy.orm
+from  sqlalchemy.sql import sqltypes
 from sqlalchemy.sql.expression import text, bindparam
 from sqlalchemy.dialects import mysql
 from sqlalchemy.schema import ForeignKey, DDLElement
@@ -151,21 +152,13 @@ def set_password(self, Password):
     def __repr__(self):
         return "<User('%d','%s')>" % (self.UserId, self.Username)
 
-def formatify(instr):
-    """This function is an ugly hack, because something in
-    MySQLdb/sqlalchemy goes wrong whenever there's a '%' (wildcard)
-    character, and it tries to run it through python's string
-    formatter. This is terrible, but it's better than being
-    insecure. Deal by escaping the %s."""
-    return instr.replace('%', '%%')
-
 class CreateDatabase(DDLElement):
     def __init__(self, name):
         self.name = name
 
 @compiles(CreateDatabase)
 def visit_create_database(element, compiler, **kw):
-    return formatify("CREATE DATABASE %s" % (compiler.preparer.quote_identifier(element.name),))
+    return "CREATE DATABASE %s" % (compiler.preparer.quote_identifier(element.name),)
 
 class DropDatabase(DDLElement):
     def __init__(self, name, ignore=False):
@@ -175,7 +168,7 @@ def __init__(self, name, ignore=False):
 @compiles(DropDatabase)
 def visit_drop_database(element, compiler, **kw):
     if_exists = "IF EXISTS" if element.ignore else ""
-    return formatify("DROP DATABASE %s %s" % (if_exists, compiler.preparer.quote_identifier(element.name)))
+    return "DROP DATABASE %s %s" % (if_exists, compiler.preparer.quote_identifier(element.name))
 
 class CreateUser(DDLElement):
     def __init__(self, name, host, passwd):
@@ -185,8 +178,8 @@ def __init__(self, name, host, passwd):
 
 @compiles(CreateUser)
 def visit_create_user(element, compiler, **kw):
-    return formatify("CREATE USER %s@%s IDENTIFIED BY %s" % \
-        tuple([compiler.sql_compiler.render_literal_value(x, sqlalchemy.String) for x in (element.name, element.host, element.passwd)]))
+    return "CREATE USER %s@%s IDENTIFIED BY %s" % \
+        tuple([compiler.sql_compiler.render_literal_value(x, sqltypes.STRINGTYPE) for x in (element.name, element.host, element.passwd)])
 
 class DropUser(DDLElement):
     def __init__(self, name, host):
@@ -195,8 +188,8 @@ def __init__(self, name, host):
 
 @compiles(DropUser)
 def visit_drop_user(element, compiler, **kw):
-    return formatify("DROP USER %s@%s" % \
-        tuple([compiler.sql_compiler.render_literal_value(x, sqlalchemy.String) for x in (element.name, element.host)]))
+    return "DROP USER %s@%s" % \
+        tuple([compiler.sql_compiler.render_literal_value(x, sqltypes.STRINGTYPE) for x in (element.name, element.host)])
 
 class ChangePassword(DDLElement):
     def __init__(self, name, host, passwd):
@@ -207,7 +200,7 @@ def __init__(self, name, host, passwd):
 @compiles(ChangePassword)
 def visit_change_password(element, compiler, **kw):
     return formatify("SET PASSWORD FOR %s@%s = PASSWORD(%s)" % \
-        tuple([compiler.sql_compiler.render_literal_value(x, sqlalchemy.String) for x in (element.name, element.host, element.passwd)]))
+        tuple([compiler.sql_compiler.render_literal_value(x, sqltypes.STRINGTYPE) for x in (element.name, element.host, element.passwd)]))
 
 class Grant(DDLElement):
     def __init__(self, db, user, host):
@@ -217,10 +210,10 @@ def __init__(self, db, user, host):
 
 @compiles(Grant)
 def visit_grant(element, compiler, **kw):
-    return formatify("GRANT ALL ON %s.* TO %s@%s" % \
+    return "GRANT ALL ON %s.* TO %s@%s" % \
         (compiler.preparer.quote_identifier(element.db),
-         compiler.sql_compiler.render_literal_value(element.user, sqlalchemy.String),
-         compiler.sql_compiler.render_literal_value(element.host, sqlalchemy.String)))
+         compiler.sql_compiler.render_literal_value(element.user, sqltypes.STRINGTYPE),
+         compiler.sql_compiler.render_literal_value(element.host, sqltypes.STRINGTYPE))
 
 class Revoke(DDLElement):
     def __init__(self, db, user, host):
@@ -230,8 +223,8 @@ def __init__(self, db, user, host):
 
 @compiles(Revoke)
 def visit_revoke(element, compiler, **kw):
-    return formatify("REVOKE ALL ON %s.* FROM %s@%s" % \
+    return "REVOKE ALL ON %s.* FROM %s@%s" % \
         (compiler.preparer.quote_identifier(element.db),
-         compiler.sql_compiler.render_literal_value(element.user, sqlalchemy.String),
-         compiler.sql_compiler.render_literal_value(element.host, sqlalchemy.String)))
+         compiler.sql_compiler.render_literal_value(element.user, sqltypes.STRINGTYPE),
+         compiler.sql_compiler.render_literal_value(element.host, sqltypes.STRINGTYPE))
 

sql-remctl

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 sql.mit.edu account management system
 
@@ -156,7 +156,7 @@ def whoami(*args):
     learn if you currently have a sql account.
     """
     kerberos_name = os.environ['REMOTE_USER']
-    username, _ = string.split(kerberos_name, '@', 2)
+    username, _ = str.split(kerberos_name, '@', 2)
     s = database.get_session()
     exists = True
     try:
@@ -218,7 +218,7 @@ def database_create(username, target, args):
     s.add(database.DBQuota(db))
     try:
         s.commit()
-    except IntegrityError, e:
+    except IntegrityError as e:
         return {'error': "Database '%s' already exists!" % (full_db_name,), 'where': 'metadata', 'status': 1}
 
     # Create the actual database
@@ -377,15 +377,15 @@ def main():
     except:
         raise NotifyUserError('Insufficient arguments specified')
 
-    print format_response(op(username, target, args))
+    print(format_response(op(username, target, args)))
 
 if __name__ == '__main__':
     try:
         main()
         sys.exit(0)
     except NotifyUserError as nue:
-        print format_response({'error': str(nue)}, status=1)
+        print(format_response({'error': str(nue)}, status=1))
     except Exception as e:
-        print format_response({'error': str(e)}, status=2)
+        print(format_response({'error': str(e)}, status=2))
 
     sys.exit(1)