no more has_key

VERSION

@@ -1 +1 @@
-Version 2.00.0 (2012-08-26 17:57:07) dev
+Version 2.00.0 (2012-08-26 18:34:47) dev

gluon/cache.py

@@ -298,7 +298,7 @@ class CacheOnDisk(CacheAbstract):
             try:
                 storage = self._open_shelf_with_lock()
                 try:
-                    if not storage.has_key(CacheAbstract.cache_stats_name):
+                    if not CacheAbstract.cache_stats_name in storage:
                         storage[CacheAbstract.cache_stats_name] = {
                             'hit_total': 0,
                             'misses': 0,

gluon/html.py

@@ -296,7 +296,8 @@ def URL(
     if other.endswith('/'):
         other += '/'    # add trailing slash to make last trailing empty arg explicit
 
-    if vars.has_key('_signature'): vars.pop('_signature')
+    if '_signature' in vars:
+        vars.pop('_signature')
     list_vars = []
     for (key, vals) in sorted(vars.items()):
         if not isinstance(vals, (list, tuple)):
@@ -387,7 +388,7 @@ def verifyURL(request, hmac_key=None, hash_vars=True, salt=None, user_signature=
 
     """
 
-    if not request.get_vars.has_key('_signature'):
+    if not '_signature' in request.get_vars:
         return False # no signature in the request URL
 
     # check if user_signature requires
@@ -1109,9 +1110,8 @@ class DIV(XmlComponent):
         sibs = [s for s in self.parent.components if not s == self]
         matches = []
         first_only = False
-        if kargs.has_key("first_only"):
+        if 'first_only' in kargs:
-            first_only = kargs["first_only"]
+            first_only = kargs.pop('first_only')
-            del kargs["first_only"]
         for c in sibs:
             try:
                 check = True

gluon/sqlhtml.py

@@ -1834,7 +1834,7 @@ class SQLFORM(FORM):
             else:
                 rows = dbset.select(left=left,orderby=orderby,*columns)
 
-            if exportManager.has_key(export_type):
+            if export_type in exportManager:
                 value = exportManager[export_type]
                 clazz = value[0] if hasattr(value, '__getitem__') else value
                 oExp = clazz(rows)

gluon/template.py

@@ -293,7 +293,7 @@ class TemplateParser(object):
         if delimiters != self.default_delimiters:
             escaped_delimiters = (re.escape(delimiters[0]),re.escape(delimiters[1]))
             self.r_tag = re.compile(r'(%s.*?%s)' % escaped_delimiters, re.DOTALL)
-        elif context.has_key('response') and hasattr(context['response'],'delimiters'):
+        elif hasattr(context.get('response',None),'delimiters'):
             if context['response'].delimiters != self.default_delimiters:
                 escaped_delimiters = (re.escape(context['response'].delimiters[0]),
                                       re.escape(context['response'].delimiters[1]))

gluon/tools.py

@@ -1753,15 +1753,15 @@ class Auth(object):
                              renew=interactivelogin)
             service = session._cas_service
             del session._cas_service
-            if request.vars.has_key('warn') and not interactivelogin:
+            if 'warn' in request.vars and not interactivelogin:
                 response.headers['refresh'] = "5;URL=%s"%service+"?ticket="+ticket
                 return A("Continue to %s"%service,
                     _href=service+"?ticket="+ticket)
             else:
                 redirect(service+"?ticket="+ticket)
-        if self.is_logged_in() and not request.vars.has_key('renew'):
+        if self.is_logged_in() and not 'renew' in request.vars:
             return allow_access()
-        elif not self.is_logged_in() and request.vars.has_key('gateway'):
+        elif not self.is_logged_in() and 'gateway' in request.vars:
             redirect(service)
         def cas_onaccept(form, onaccept=onaccept):
             if not onaccept is DEFAULT: onaccept(form)
@@ -1774,7 +1774,7 @@ class Auth(object):
         db, table = self.db, self.table_cas()
         current.response.headers['Content-Type']='text'
         ticket = request.vars.ticket
-        renew = True if request.vars.has_key('renew') else False
+        renew = 'renew' in request.vars
         row = table(ticket=ticket)
         success = False
         if row:
@@ -1993,10 +1993,10 @@ class Auth(object):
             # user wants to be logged in for longer
             self.login_user(user)
             session.auth.expiration = \
-                request.vars.get("remember",False) and \
+                request.vars.get('remember',False) and \
                 self.settings.long_expiration or \
                 self.settings.expiration
-            session.auth.remember = request.vars.has_key("remember"),
+            session.auth.remember = 'remember' in request.vars
             self.log_event(log, user)
             session.flash = self.messages.logged_in
 
@@ -3724,14 +3724,14 @@ def universal_caller(f, *a, **b):
     # There might be pos_args left, that are sent as named_values. Gather them as well.
     # If a argument already is populated with values we simply replaces them.
     for arg_name in pos_args[len(arg_dict):]:
-        if b.has_key(arg_name):
+        if arg_name in b:
             arg_dict[arg_name] = b[arg_name]
 
     if len(arg_dict) >= len(pos_args):
         # All the positional arguments is found. The function may now be called.
         # However, we need to update the arg_dict with the values from the named arguments as well.
         for arg_name in named_args:
-            if b.has_key(arg_name):
+            if arg_name in b:
                 arg_dict[arg_name] = b[arg_name]
 
         return f(**arg_dict)