Index: /package_branches/invirt-web/cherrypy-rebased/code/main.py
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2706)
+++ /package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2707)
@@ -200,7 +200,7 @@
 
     def parseCreate(self, fields):
-        kws = dict([(kw, fields.get(kw)) for kw in
+        kws = dict([(kw, fields[kw]) for kw in
          'name description owner memory disksize vmtype cdrom autoinstall'.split()
-                    if fields.get(kw)])
+                    if fields[kw]])
         validate = validation.Validate(cherrypy.request.login,
                                        cherrypy.request.state,
@@ -230,6 +230,6 @@
         d['err'] = err
         if err:
-            for field in fields.keys():
-                setattr(d['defaults'], field, fields.get(field))
+            for field, value in fields.items():
+                setattr(d['defaults'], field, value))
         else:
             d['new_machine'] = parsed_fields['name']
@@ -295,6 +295,6 @@
             info_dict['err'] = err
             if err:
-                for field in fields.keys():
-                    setattr(info_dict['defaults'], field, fields.get(field))
+                for field, value in fields.items():
+                    setattr(info_dict['defaults'], field, value)
             info_dict['result'] = result
             return info_dict
@@ -528,7 +528,7 @@
     session.begin()
     try:
-        kws = dict([(kw, fields.get(kw)) for kw in
+        kws = dict([(kw, fields[kw]) for kw in
          'owner admin contact name description memory vmtype disksize'.split()
-                    if fields.get(kw)])
+                    if fields[kw]])
         kws['machine_id'] = machine_id
         validate = validation.Validate(username, state, **kws)