Merge my own changes from different checkouts

Author: schlatterbeck

roundup/cgi/client.py

@@ -1203,11 +1203,15 @@ def handle_action(self):
             We explicitly catch Reject and ValueError exceptions and
             present their messages to the user.
         """
-        if ':action' in self.form:
-            action = self.form[':action']
-        elif '@action' in self.form:
-            action = self.form['@action']
-        else:
+        action = None
+        try:
+            if ':action' in self.form:
+                action = self.form[':action']
+            elif '@action' in self.form:
+                action = self.form['@action']
+        except TypeError:
+            pass
+        if action is None:
             return None
 
         if isinstance(action, list):

roundup/cgi/templating.py

@@ -509,7 +509,6 @@ def __getitem__(self, item):
             raise KeyError, 'No such property "%s" on %s'%(item, self.classname)
 
         # look up the correct HTMLProperty class
-        form = self._client.form
         for klass, htmlklass in propclasses:
             if not isinstance(prop, klass):
                 continue
@@ -1225,7 +1224,11 @@ def __init__(self, client, classname, nodeid, prop, name, value,
         # If no value is already present for this property, see if one
         # is specified in the current form.
         form = self._client.form
-        if not self._value and form.has_key(self._formname):
+        try:
+            is_in = form.has_key(self._formname)
+        except TypeError:
+            is_in = False
+        if not self._value and is_in:
             if isinstance(prop, hyperdb.Multilink):
                 value = lookupIds(self._db, prop,
                                   handleListCGIValue(form[self._formname]),
@@ -2426,7 +2429,7 @@ def _parse_sort(self, var, name):
         for special in '@:':
             idx = 0
             key = '%s%s%d'%(special, name, idx)
-            while key in self.form:
+            while self._form_has_key(key):
                 self.special_char = special
                 fields.append(self.form.getfirst(key))
                 dirkey = '%s%sdir%d'%(special, name, idx)
@@ -2439,7 +2442,7 @@ def _parse_sort(self, var, name):
             # backward compatible (and query) URL format
             key = special + name
             dirkey = key + 'dir'
-            if key in self.form and not fields:
+            if self._form_has_key(key) and not fields:
                 fields = handleListCGIValue(self.form[key])
                 if dirkey in self.form:
                     dirs.append(self.form.getfirst(dirkey))
@@ -2453,13 +2456,20 @@ def _parse_sort(self, var, name):
             else:
                 var.append(('+', f))
 
+    def _form_has_key(self, name):
+        try:
+            return self.form.has_key(name)
+        except TypeError:
+            pass
+        return False
+
     def _post_init(self):
         """ Set attributes based on self.form
         """
         # extract the index display information from the form
         self.columns = []
         for name in ':columns @columns'.split():
-            if self.form.has_key(name):
+            if self._form_has_key(name):
                 self.special_char = name[0]
                 self.columns = handleListCGIValue(self.form[name])
                 break
@@ -2478,7 +2488,7 @@ def _post_init(self):
         # filtering
         self.filter = []
         for name in ':filter @filter'.split():
-            if self.form.has_key(name):
+            if self._form_has_key(name):
                 self.special_char = name[0]
                 self.filter = handleListCGIValue(self.form[name])
 
@@ -2487,7 +2497,7 @@ def _post_init(self):
         if self.classname is not None:
             cls = db.getclass (self.classname)
             for name in self.filter:
-                if not self.form.has_key(name):
+                if not self._form_has_key(name):
                     continue
                 prop = cls.get_transitive_prop (name)
                 fv = self.form[name]
@@ -2509,15 +2519,15 @@ def _post_init(self):
         # full-text search argument
         self.search_text = None
         for name in ':search_text @search_text'.split():
-            if self.form.has_key(name):
+            if self._form_has_key(name):
                 self.special_char = name[0]
                 self.search_text = self.form.getfirst(name)
 
         # pagination - size and start index
         # figure batch args
         self.pagesize = 50
         for name in ':pagesize @pagesize'.split():
-            if self.form.has_key(name):
+            if self._form_has_key(name):
                 self.special_char = name[0]
                 try:
                     self.pagesize = int(self.form.getfirst(name))
@@ -2527,7 +2537,7 @@ def _post_init(self):
 
         self.startwith = 0
         for name in ':startwith @startwith'.split():
-            if self.form.has_key(name):
+            if self._form_has_key(name):
                 self.special_char = name[0]
                 try:
                     self.startwith = int(self.form.getfirst(name))
@@ -2536,7 +2546,7 @@ def _post_init(self):
                     pass
 
         # dispname
-        if self.form.has_key('@dispname'):
+        if self._form_has_key('@dispname'):
             self.dispname = self.form.getfirst('@dispname')
         else:
             self.dispname = None