Fixed #4040 -- Changed uses of has_key() to "in". Slight performance

improvement and forward-compatible with future Python releases. Patch from Gary
Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5091 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 4 insertions, 4 deletions

diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 466897ad86..91629cd679 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -779,7 +779,7 @@ class SlugField(Field):
         kwargs['maxlength'] = kwargs.get('maxlength', 50)
         kwargs.setdefault('validator_list', []).append(validators.isSlug)
         # Set db_index=True unless it's been set manually.
-        if not kwargs.has_key('db_index'):
+        if 'db_index' not in kwargs:
             kwargs['db_index'] = True
         Field.__init__(self, *args, **kwargs)
 
diff --git a/django/db/models/fields/generic.py b/django/db/models/fields/generic.py
index 480ee689c9..f995ab2044 100644
--- a/django/db/models/fields/generic.py
+++ b/django/db/models/fields/generic.py
@@ -37,7 +37,7 @@ class GenericForeignKey(object):
     def instance_pre_init(self, signal, sender, args, kwargs):
         # Handle initalizing an object with the generic FK instaed of 
         # content-type/object-id fields.        
-        if kwargs.has_key(self.name):
+        if self.name in kwargs:
             value = kwargs.pop(self.name)
             kwargs[self.ct_field] = self.get_content_type(value)
             kwargs[self.fk_field] = value._get_pk_val()
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index fad9c164c1..e8152f32e7 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -474,7 +474,7 @@ class ForeignKey(RelatedField, Field):
             to_field = to_field or to._meta.pk.name
         kwargs['verbose_name'] = kwargs.get('verbose_name', '')
 
-        if kwargs.has_key('edit_inline_type'):
+        if 'edit_inline_type' in kwargs:
             import warnings
             warnings.warn("edit_inline_type is deprecated. Use edit_inline instead.")
             kwargs['edit_inline'] = kwargs.pop('edit_inline_type')
@@ -567,7 +567,7 @@ class OneToOneField(RelatedField, IntegerField):
             to_field = to_field or to._meta.pk.name
         kwargs['verbose_name'] = kwargs.get('verbose_name', '')
 
-        if kwargs.has_key('edit_inline_type'):
+        if 'edit_inline_type' in kwargs:
             import warnings
             warnings.warn("edit_inline_type is deprecated. Use edit_inline instead.")
             kwargs['edit_inline'] = kwargs.pop('edit_inline_type')