Skip to content

Commit 507abab

Browse files
committed
a couple small fixes to the eventbrite code
1 parent c65e9e2 commit 507abab

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

encrypted_fields/fields.py

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
12
import os
3+
import types
24

35
from django.db import models
46
from django.conf import settings
7+
from django.core.exceptions import ImproperlyConfigured
58

69
try:
710
from django.utils.encoding import smart_text
@@ -143,7 +146,7 @@ def get_internal_type(self):
143146
return 'TextField'
144147

145148
def to_python(self, value):
146-
if value is None or not isinstance(value, basestring):
149+
if value is None or not isinstance(value, types.StringTypes):
147150
return value
148151

149152
if self.prefix and value.startswith(self.prefix):
@@ -168,13 +171,19 @@ def get_db_prep_value(self, value, connection, prepared=False):
168171
value = self.get_prep_value(value)
169172

170173
if self.enforce_max_length:
171-
if ( value and
172-
hasattr(self, 'max_length') and self.max_length and
173-
len(value) > self.max_length
174-
):
174+
if (
175+
value
176+
and hasattr(self, 'max_length')
177+
and self.max_length
178+
and len(value) > self.max_length
179+
):
175180
raise ValueError(
176-
'Field %s max_length=%s encrypted_len=%s' %
177-
(self.name, self.max_length, len(value),))
181+
'Field {} max_length={} encrypted_len={}'.format(
182+
self.name,
183+
self.max_length,
184+
len(value),
185+
)
186+
)
178187
return value
179188

180189

0 commit comments

Comments
 (0)