Merge pull request #53 from Mobeye/python3-compat

Fix issue #52 python 2-3 compatibility

bitfield/admin.py

@@ -1,3 +1,5 @@
+import six
+
 from django.db.models import F
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
@@ -22,7 +24,7 @@ def __init__(self, field, request, params, model, model_admin, field_path):
             field, request, params, model, model_admin, field_path)
 
     def queryset(self, request, queryset):
-        filter = dict((p, bitor(F(p), v)) for p, v in self.used_parameters.iteritems())
+        filter = dict((p, bitor(F(p), v)) for p, v in six.iteritems(self.used_parameters))
         try:
             return queryset.filter(**filter)
         except ValidationError as e:

bitfield/types.py

@@ -1,3 +1,6 @@
+from six import string_types
+
+
 class Bit(object):
     """
     Represents a single Bit.
@@ -229,7 +232,7 @@ def iteritems(self):
             yield (k, getattr(self, k).is_set)
 
     def get_label(self, flag):
-        if isinstance(flag, basestring):
+        if isinstance(flag, string_types):
             flag = self._keys.index(flag)
         if isinstance(flag, Bit):
             flag = flag.number