s/basestring/string_types
This commit is contained in:
parent
0b80bebf15
commit
8dbe22b6ea
1 changed files with 4 additions and 3 deletions
|
@ -10,6 +10,7 @@ import hashlib
|
|||
import base64
|
||||
import binascii
|
||||
|
||||
from six import string_types
|
||||
from django.db import models
|
||||
from django.conf import settings
|
||||
import ox
|
||||
|
@ -36,7 +37,7 @@ def find(info, guess=True):
|
|||
else:
|
||||
for key in Imdb.keys:
|
||||
if key in info and info[key]:
|
||||
if isinstance(info[key], basestring):
|
||||
if isinstance(info[key], string_types):
|
||||
fkey = '%s__iexact'%key
|
||||
else:
|
||||
fkey = key
|
||||
|
@ -118,7 +119,7 @@ class Imdb(models.Model):
|
|||
value = info[key]
|
||||
if isinstance(value, list):
|
||||
value = u'\n'.join(value) + '\n'
|
||||
if isinstance(value, basestring):
|
||||
if isinstance(value, string_types):
|
||||
value = normalize_value(value)
|
||||
setattr(self, key, value)
|
||||
if self.season < 0:
|
||||
|
@ -227,7 +228,7 @@ class Imdb(models.Model):
|
|||
for key in list(j):
|
||||
if not j[key]:
|
||||
del j[key]
|
||||
if 'year' in j and isinstance(j['year'], basestring) and j['year'].isdigit():
|
||||
if 'year' in j and isinstance(j['year'], string_types) and j['year'].isdigit():
|
||||
j['year'] = int(j['year'])
|
||||
return j
|
||||
|
||||
|
|
Loading…
Reference in a new issue