[py3] Removed longs. (56dbe924) · Commits · Dom Sekotill / django

django/contrib/admin/util.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ from django.utils.html import format_html
		from django.utils.text import capfirst
		from django.utils import timezone
		from django.utils.encoding import force_unicode, smart_unicode, smart_str
		from django.utils import six
		from django.utils.translation import ungettext
		from django.core.urlresolvers import reverse

		@@ -349,7 +350,7 @@ def display_for_value(value, boolean=False):
		return formats.localize(timezone.template_localtime(value))
		elif isinstance(value, (datetime.date, datetime.time)):
		return formats.localize(value)
		elif isinstance(value, (decimal.Decimal, float, int, long)):
		elif isinstance(value, six.integer_types + (decimal.Decimal, float)):
		return formats.number_format(value)
		else:
		return smart_unicode(value)

django/contrib/gis/db/backends/oracle/operations.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ from django.contrib.gis.db.backends.oracle.adapter import OracleSpatialAdapter
		from django.contrib.gis.db.backends.util import SpatialFunction
		from django.contrib.gis.geometry.backend import Geometry
		from django.contrib.gis.measure import Distance
		from django.utils import six

		class SDOOperation(SpatialFunction):
		"Base class for SDO* Oracle operations."
		@@ -65,7 +66,7 @@ class SDORelate(SpatialFunction):
		super(SDORelate, self).__init__(self.relate_func, mask=mask)

		# Valid distance types and substitutions
		dtypes = (Decimal, Distance, float, int, long)
		dtypes = (Decimal, Distance, float) + six.integer_types

		class OracleOperations(DatabaseOperations, BaseSpatialOperations):
		compiler_module = "django.contrib.gis.db.backends.oracle.compiler"

django/contrib/gis/db/backends/postgis/operations.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ from django.contrib.gis.measure import Distance
		from django.core.exceptions import ImproperlyConfigured
		from django.db.backends.postgresql_psycopg2.base import DatabaseOperations
		from django.db.utils import DatabaseError
		from django.utils import six

		#### Classes used in constructing PostGIS spatial SQL ####
		class PostGISOperator(SpatialOperation):
		@@ -165,7 +166,7 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
		}

		# Valid distance types and substitutions
		dtypes = (Decimal, Distance, float, int, long)
		dtypes = (Decimal, Distance, float) + six.integer_types
		def get_dist_ops(operator):
		"Returns operations for both regular and spherical distances."
		return {'cartesian' : PostGISDistance(prefix, operator),

django/contrib/gis/db/backends/spatialite/operations.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ from django.contrib.gis.measure import Distance
		from django.core.exceptions import ImproperlyConfigured
		from django.db.backends.sqlite3.base import DatabaseOperations
		from django.db.utils import DatabaseError
		from django.utils import six

		class SpatiaLiteOperator(SpatialOperation):
		"For SpatiaLite operators (e.g. `&&`, `~`)."
		@@ -42,7 +43,7 @@ class SpatiaLiteRelate(SpatiaLiteFunctionParam):
		super(SpatiaLiteRelate, self).__init__('Relate')

		# Valid distance types and substitutions
		dtypes = (Decimal, Distance, float, int, long)
		dtypes = (Decimal, Distance, float) + six.integer_types
		def get_dist_ops(operator):
		"Returns operations for regular distances; spherical distances are not currently supported."
		return (SpatiaLiteDistance(operator),)

django/contrib/gis/db/models/query.py

+6 −5

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ from django.contrib.gis.db.models.fields import get_srid_info, PointField, LineS
		from django.contrib.gis.db.models.sql import AreaField, DistanceField, GeomField, GeoQuery
		from django.contrib.gis.geometry.backend import Geometry
		from django.contrib.gis.measure import Area, Distance
		from django.utils import six

		class GeoQuerySet(QuerySet):
		"The Geographic QuerySet."
		@@ -144,7 +145,7 @@ class GeoQuerySet(QuerySet):
		if not backend.geojson:
		raise NotImplementedError('Only PostGIS 1.3.4+ supports GeoJSON serialization.')

		if not isinstance(precision, (int, long)):
		if not isinstance(precision, six.integer_types):
		raise TypeError('Precision keyword must be set with an integer.')

		# Setting the options flag -- which depends on which version of
		@@ -309,7 +310,7 @@ class GeoQuerySet(QuerySet):
		- 2 arguments: X and Y sizes to snap the grid to.
		- 4 arguments: X, Y sizes and the X, Y origins.
		"""
		if False in [isinstance(arg, (float, int, long)) for arg in args]:
		if False in [isinstance(arg, (float,) + six.integer_types) for arg in args]:
		raise TypeError('Size argument(s) for the grid must be a float or integer values.')

		nargs = len(args)
		@@ -349,7 +350,7 @@ class GeoQuerySet(QuerySet):
		digits used in output (defaults to 8).
		"""
		relative = int(bool(relative))
		if not isinstance(precision, (int, long)):
		if not isinstance(precision, six.integer_types):
		raise TypeError('SVG precision keyword argument must be an integer.')
		s = {'desc' : 'SVG',
		'procedure_fmt' : '%(geo_col)s,%(rel)s,%(precision)s',
		@@ -390,7 +391,7 @@ class GeoQuerySet(QuerySet):
		Transforms the given geometry field to the given SRID. If no SRID is
		provided, the transformation will default to using 4326 (WGS84).
		"""
		if not isinstance(srid, (int, long)):
		if not isinstance(srid, six.integer_types):
		raise TypeError('An integer SRID must be provided.')
		field_name = kwargs.get('field_name', None)
		tmp, geo_field = self._spatial_setup('transform', field_name=field_name)