p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaced types.NoneType occurrences 

In Python 3, types.NoneType is no more available.
This commit is contained in:
Claude Paroz 2012-05-23 12:20:03 +02:00
parent 0df4593f0e
commit 817535d73e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/gis/gdal/base.py
View File

@ -1,5 +1,5 @@
from ctypes import c_void_p from ctypes import c_void_p
from types import NoneType
from django.contrib.gis.gdal.error import GDALException from django.contrib.gis.gdal.error import GDALException
class GDALBase(object): class GDALBase(object):
@ -26,7 +26,7 @@ class GDALBase(object):
# compatible type or None (NULL). # compatible type or None (NULL).
if isinstance(ptr, (int, long)): if isinstance(ptr, (int, long)):
self._ptr = self.ptr_type(ptr) self._ptr = self.ptr_type(ptr)
elif isinstance(ptr, (self.ptr_type, NoneType)): elif ptr is None or isinstance(ptr, self.ptr_type):
self._ptr = ptr self._ptr = ptr
else: else:
raise TypeError('Incompatible pointer type') raise TypeError('Incompatible pointer type')

4
django/contrib/gis/geos/base.py
View File

@ -1,5 +1,5 @@
from ctypes import c_void_p from ctypes import c_void_p
from types import NoneType
from django.contrib.gis.geos.error import GEOSException from django.contrib.gis.geos.error import GEOSException
# Trying to import GDAL libraries, if available. Have to place in # Trying to import GDAL libraries, if available. Have to place in
@ -41,7 +41,7 @@ class GEOSBase(object):
def _set_ptr(self, ptr): def _set_ptr(self, ptr):
# Only allow the pointer to be set with pointers of the # Only allow the pointer to be set with pointers of the
# compatible type or None (NULL). # compatible type or None (NULL).
if isinstance(ptr, (self.ptr_type, NoneType)): if ptr is None or isinstance(ptr, self.ptr_type):
self._ptr = ptr self._ptr = ptr
else: else:
raise TypeError('Incompatible pointer type') raise TypeError('Incompatible pointer type')

5
django/utils/encoding.py
View File

@ -1,4 +1,3 @@
import types
import urllib import urllib
import locale import locale
import datetime import datetime
@ -45,7 +44,7 @@ def is_protected_type(obj):
force_unicode(strings_only=True). force_unicode(strings_only=True).
""" """
return isinstance(obj, ( return isinstance(obj, (
types.NoneType, type(None),
int, long, int, long,
datetime.datetime, datetime.date, datetime.time, datetime.datetime, datetime.date, datetime.time,
float, Decimal) float, Decimal)
@ -107,7 +106,7 @@ def smart_str(s, encoding='utf-8', strings_only=False, errors='strict'):
If strings_only is True, don't convert (some) non-string-like objects. If strings_only is True, don't convert (some) non-string-like objects.
""" """
if strings_only and isinstance(s, (types.NoneType, int)): if strings_only and (s is None or isinstance(s, int)):
return s return s
if isinstance(s, Promise): if isinstance(s, Promise):
return unicode(s).encode(encoding, errors) return unicode(s).encode(encoding, errors)