Gutsy? Why are we defaulting to Gutsy?

[invirt/packages/invirt-web.git] / code / webcommon.py

diff --git a/code/webcommon.py b/code/webcommon.py
index e82f790..7410523 100644 (file)
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -1,28 +1,9 @@
 """Exceptions for the web interface."""
 
 import time
 """Exceptions for the web interface."""
 
 import time

+from invirt import database

 from invirt.database import Machine, MachineAccess
 
 from invirt.database import Machine, MachineAccess
 

-class MyException(Exception):
-    """Base class for my exceptions"""
-    pass
-
-class InvalidInput(MyException):
-    """Exception for user-provided input is invalid but maybe in good faith.
-
-    This would include setting memory to negative (which might be a
-    typo) but not setting an invalid boot CD (which requires bypassing
-    the select box).
-    """
-    def __init__(self, err_field, err_value, expl=None):
-        MyException.__init__(self, expl)
-        self.err_field = err_field
-        self.err_value = err_value
-
-class CodeError(MyException):
-    """Exception for internal errors or bad faith input."""
-    pass
-

 import controls
 
 def cachedproperty(func):
 import controls
 
 def cachedproperty(func):

@@ -44,9 +25,9 @@ class State(object):
 
     def getMachines(self):
         if self.isadmin:
 
     def getMachines(self):
         if self.isadmin:

-            return Machine.select()
+            return Machine.query().all()

         else:
         else:

-            return Machine.query().join('acl').select_by(user=self.username)
+            return Machine.query().join('acl').filter_by(user=self.username)

 
     machines = cachedproperty(getMachines)
     xmlist_raw = cachedproperty(lambda self: controls.getList())
 
     machines = cachedproperty(getMachines)
     xmlist_raw = cachedproperty(lambda self: controls.getList())