Skip to content

Commit f287c09

Browse files
authored
Remove leftover Python2 compatibility hybridation.
Compatibility has already been dropped anyway in 2.2.0.
1 parent 70b389d commit f287c09

File tree

4 files changed

+3
-14
lines changed

4 files changed

+3
-14
lines changed

bitfield/admin.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import django
2-
import six
32

43
from django.core.exceptions import ValidationError
54
if django.VERSION < (2, 0):
@@ -29,7 +28,7 @@ def __init__(self, field, request, params, model, model_admin, field_path):
2928
def queryset(self, request, queryset):
3029
filter_kwargs = dict(
3130
(p, BitHandler(v, ()))
32-
for p, v in six.iteritems(self.used_parameters)
31+
for p, v in self.used_parameters.items()
3332
)
3433
if not filter_kwargs:
3534
return queryset

bitfield/models.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
from __future__ import absolute_import
2-
3-
import six
4-
51
from django.db.models import signals
62
from django.db.models.fields import Field, BigIntegerField
73

@@ -154,7 +150,7 @@ def to_python(self, value):
154150
# Regression for #1425: fix bad data that was created resulting
155151
# in negative values for flags. Compute the value that would
156152
# have been visible ot the application to preserve compatibility.
157-
if isinstance(value, six.integer_types) and value < 0:
153+
if isinstance(value, int) and value < 0:
158154
new_value = 0
159155
for bit_number, _ in enumerate(self.flags):
160156
new_value |= (value & (2 ** bit_number))

bitfield/types.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
from __future__ import absolute_import
2-
3-
from six import string_types
4-
5-
61
def cmp(a, b):
72
return (a > b) - (a < b)
83

@@ -238,7 +233,7 @@ def iteritems(self):
238233
yield (k, getattr(self, k).is_set)
239234

240235
def get_label(self, flag):
241-
if isinstance(flag, string_types):
236+
if isinstance(flag, str):
242237
flag = self._keys.index(flag)
243238
if isinstance(flag, Bit):
244239
flag = flag.number

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ def visit_Assign(self, node):
3131
zip_safe=False,
3232
install_requires=[
3333
'Django>=1.11.29',
34-
'six',
3534
],
3635
extras_require={
3736
'tests': [

0 commit comments

Comments
 (0)