Changeset 9701 for main/waeup.kofa/trunk/src/waeup/kofa/browser

Timestamp:

20 Nov 2012, 11:16:38 (12 years ago)

Author:

Henrik Bettermann

Message:

Replace 'has_key' by 'in'

Location:

main/waeup.kofa/trunk/src/waeup/kofa/browser

Files:

• pages.py (modified) (3 diffs)
• tests/test_browser.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -123 +123 @@
 def delSubobjects(view, redirect, tab=None, subcontainer=None):
     form = view.request.form
-    if form.has_key('val_id'):
+    if 'val_id' in form:
         child_id = form['val_id']
     else:
@@ -242 +242 @@
             # has been set.
             login = self.request.form['form.login']
-            if len(login) == 8 and grok.getSite()['students'].has_key(login):
+            if len(login) == 8 and login in grok.getSite()['students']:
                 student = grok.getSite()['students'][login]
                 password = self.request.form['form.password']
@@ -841 +841 @@
     def delFiles(self, **data):
         form = self.request.form
-        if form.has_key('val_id'):
+        if 'val_id' in form:
             child_id = form['val_id']
         else:

main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py

@@ -316 +316 @@
         # former_course attribute of the corresponding course is set.
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.assertTrue(self.app['faculties']['fac1']['dep1'].certificates[
-            'CERT1'].has_key('COURSE1_100'))
+        self.assertTrue('COURSE1_100' in self.app[
+            'faculties']['fac1']['dep1'].certificates['CERT1'])
         self.browser.open(
             'http://localhost/app/faculties/fac1/dep1/courses/COURSE1/manage')
         self.browser.getControl(name="form.former_course").value = ['selected']
         self.browser.getControl("Save").click()
-        self.assertFalse(self.app['faculties']['fac1']['dep1'].certificates[
-            'CERT1'].has_key('COURSE1_100'))
+        self.assertFalse('COURSE1_100' in self.app[
+            'faculties']['fac1']['dep1'].certificates['CERT1'])
         return
 
@@ -330 +330 @@
         # the corresponding course is removed.
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.assertTrue(self.app['faculties']['fac1']['dep1'].certificates[
-            'CERT1'].has_key('COURSE1_100'))
+        self.assertTrue('COURSE1_100' in self.app[
+            'faculties']['fac1']['dep1'].certificates['CERT1'])
         self.browser.open('http://localhost/app/faculties/fac1/dep1/manage')
         ctrl = self.browser.getControl(name='val_id')
         ctrl.getControl(value='COURSE1').selected = True
         self.browser.getControl("Remove selected", index=0).click()
-        self.assertFalse(self.app['faculties']['fac1']['dep1'].certificates[
-            'CERT1'].has_key('COURSE1_100'))
-        return
+        self.assertFalse('COURSE1_100' in self.app[
+            'faculties']['fac1']['dep1'].certificates['CERT1'])
+        return