Replaced print statement by print function (forward compatibility syntax).

Author: claudep

django/bin/profiling/gather_profile_stats.py

@@ -24,7 +24,7 @@ def gather_stats(p):
  prof = stats.load(os.path.join(p, f))
  else:
  continue
- print "Processing %s" % f
+ print("Processing %s" % f)
  if path in profiles:
  profiles[path].add(prof)
  else:

django/bin/unique-messages.py

@@ -11,7 +11,7 @@ def unique_messages():
  elif os.path.isdir('locale'):
  basedir = os.path.abspath('locale')
  else:
- print "This script should be run from the Django Git tree or your project or app tree."
+ print("This script should be run from the Django Git tree or your project or app tree.")
  sys.exit(1)
 
  for (dirpath, dirnames, filenames) in os.walk(basedir):

django/contrib/auth/management/__init__.py

@@ -54,7 +54,7 @@ def create_permissions(app, created_models, verbosity, **kwargs):
  auth_app.Permission.objects.bulk_create(objs)
  if verbosity >= 2:
  for obj in objs:
- print "Adding permission '%s'" % obj
+ print("Adding permission '%s'" % obj)
 
 
 def create_superuser(app, created_models, verbosity, db, **kwargs):

django/contrib/contenttypes/management.py

@@ -39,7 +39,7 @@ def update_contenttypes(app, created_models, verbosity=2, **kwargs):
  ])
  if verbosity >= 2:
  for ct in cts:
- print "Adding content type '%s | %s'" % (ct.app_label, ct.model)
+ print("Adding content type '%s | %s'" % (ct.app_label, ct.model))
 
  # Confirm that the content type is stale before deletion.
  if to_remove:
@@ -63,11 +63,11 @@ def update_contenttypes(app, created_models, verbosity=2, **kwargs):
  if ok_to_delete == 'yes':
  for ct in to_remove:
  if verbosity >= 2:
- print "Deleting stale content type '%s | %s'" % (ct.app_label, ct.model)
+ print("Deleting stale content type '%s | %s'" % (ct.app_label, ct.model))
  ct.delete()
  else:
  if verbosity >= 2:
- print "Stale content types remain."
+ print("Stale content types remain.")
 
 def update_all_contenttypes(verbosity=2, **kwargs):
  for app in get_apps():

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

@@ -24,7 +24,7 @@ def create_test_db(self, verbosity=1, autoclobber=False):
  test_db_repr = ''
  if verbosity >= 2:
  test_db_repr = " ('%s')" % test_database_name
- print "Creating test database for alias '%s'%s..." % (self.connection.alias, test_db_repr)
+ print("Creating test database for alias '%s'%s..." % (self.connection.alias, test_db_repr))
 
  self._create_test_db(verbosity, autoclobber)
 

django/contrib/gis/gdal/geometries.py

@@ -13,30 +13,30 @@
  >>> from django.contrib.gis.gdal import OGRGeometry, OGRGeomType, SpatialReference
  >>> wkt1, wkt2 = 'POINT(-90 30)', 'POLYGON((0 0, 5 0, 5 5, 0 5)'
  >>> pnt = OGRGeometry(wkt1)
- >>> print pnt
+ >>> print(pnt)
  POINT (-90 30)
  >>> mpnt = OGRGeometry(OGRGeomType('MultiPoint'), SpatialReference('WGS84'))
  >>> mpnt.add(wkt1)
  >>> mpnt.add(wkt1)
- >>> print mpnt
+ >>> print(mpnt)
  MULTIPOINT (-90 30,-90 30)
- >>> print mpnt.srs.name
+ >>> print(mpnt.srs.name)
  WGS 84
- >>> print mpnt.srs.proj
+ >>> print(mpnt.srs.proj)
  +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs
  >>> mpnt.transform_to(SpatialReference('NAD27'))
- >>> print mpnt.proj
+ >>> print(mpnt.proj)
  +proj=longlat +ellps=clrk66 +datum=NAD27 +no_defs
- >>> print mpnt
+ >>> print(mpnt)
  MULTIPOINT (-89.999930378602485 29.999797886557641,-89.999930378602485 29.999797886557641)
 
  The OGRGeomType class is to make it easy to specify an OGR geometry type:
  >>> from django.contrib.gis.gdal import OGRGeomType
  >>> gt1 = OGRGeomType(3) # Using an integer for the type
  >>> gt2 = OGRGeomType('Polygon') # Using a string
  >>> gt3 = OGRGeomType('POLYGON') # It's case-insensitive
- >>> print gt1 == 3, gt1 == 'Polygon' # Equivalence works w/non-OGRGeomType objects
- True
+ >>> print(gt1 == 3, gt1 == 'Polygon') # Equivalence works w/non-OGRGeomType objects
+ True True
 """
 # Python library requisites.
 import sys

django/contrib/gis/gdal/srs.py

@@ -4,7 +4,7 @@
  Example:
  >>> from django.contrib.gis.gdal import SpatialReference
  >>> srs = SpatialReference('WGS84')
- >>> print srs
+ >>> print(srs)
  GEOGCS["WGS 84",
  DATUM["WGS_1984",
  SPHEROID["WGS 84",6378137,298.257223563,
@@ -16,14 +16,14 @@
  UNIT["degree",0.01745329251994328,
  AUTHORITY["EPSG","9122"]],
  AUTHORITY["EPSG","4326"]]
- >>> print srs.proj
+ >>> print(srs.proj)
  +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs
- >>> print srs.ellipsoid
+ >>> print(srs.ellipsoid)
  (6378137.0, 6356752.3142451793, 298.25722356300003)
- >>> print srs.projected, srs.geographic
+ >>> print(srs.projected, srs.geographic)
  False True
  >>> srs.import_epsg(32140)
- >>> print srs.name
+ >>> print(srs.name)
  NAD83 / Texas South Central
 """
 from ctypes import byref, c_char_p, c_int
@@ -103,19 +103,19 @@ def __getitem__(self, target):
 
  >>> wkt = 'GEOGCS["WGS 84", DATUM["WGS_1984, ... AUTHORITY["EPSG","4326"]]')
  >>> srs = SpatialReference(wkt) # could also use 'WGS84', or 4326
- >>> print srs['GEOGCS']
+ >>> print(srs['GEOGCS'])
  WGS 84
- >>> print srs['DATUM']
+ >>> print(srs['DATUM'])
  WGS_1984
- >>> print srs['AUTHORITY']
+ >>> print(srs['AUTHORITY'])
  EPSG
- >>> print srs['AUTHORITY', 1] # The authority value
+ >>> print(srs['AUTHORITY', 1]) # The authority value
  4326
- >>> print srs['TOWGS84', 4] # the fourth value in this wkt
+ >>> print(srs['TOWGS84', 4]) # the fourth value in this wkt
  0
- >>> print srs['UNIT|AUTHORITY'] # For the units authority, have to use the pipe symbole.
+ >>> print(srs['UNIT|AUTHORITY']) # For the units authority, have to use the pipe symbole.
  EPSG
- >>> print srs['UNIT|AUTHORITY', 1] # The authority value for the untis
+ >>> print(srs['UNIT|AUTHORITY', 1]) # The authority value for the untis
  9122
  """
  if isinstance(target, tuple):

django/contrib/gis/gdal/tests/test_ds.py

@@ -59,7 +59,7 @@ def test02_invalid_shp(self):
 
  def test03a_layers(self):
  "Testing Data Source Layers."
- print "\nBEGIN - expecting out of range feature id error; safe to ignore.\n"
+ print("\nBEGIN - expecting out of range feature id error; safe to ignore.\n")
  for source in ds_list:
  ds = DataSource(source.ds)
 
@@ -108,7 +108,7 @@ def test03a_layers(self):
  # the feature values here while in this loop.
  for fld_name in fld_names:
  self.assertEqual(source.field_values[fld_name][i], feat.get(fld_name))
- print "\nEND - expecting out of range feature id error; safe to ignore."
+ print("\nEND - expecting out of range feature id error; safe to ignore.")
 
  def test03b_layer_slice(self):
  "Test indexing and slicing on Layers."

django/contrib/gis/gdal/tests/test_geom.py

@@ -234,15 +234,15 @@ def test07b_closepolygons(self):
  # Both rings in this geometry are not closed.
  poly = OGRGeometry('POLYGON((0 0, 5 0, 5 5, 0 5), (1 1, 2 1, 2 2, 2 1))')
  self.assertEqual(8, poly.point_count)
- print "\nBEGIN - expecting IllegalArgumentException; safe to ignore.\n"
+ print("\nBEGIN - expecting IllegalArgumentException; safe to ignore.\n")
  try:
  c = poly.centroid
  except OGRException:
  # Should raise an OGR exception, rings are not closed
  pass
  else:
  self.fail('Should have raised an OGRException!')
- print "\nEND - expecting IllegalArgumentException; safe to ignore.\n"
+ print("\nEND - expecting IllegalArgumentException; safe to ignore.\n")
 
  # Closing the rings -- doesn't work on GDAL versions 1.4.1 and below:
  # http://trac.osgeo.org/gdal/ticket/1673

django/contrib/gis/geos/tests/test_geos.py

@@ -134,7 +134,7 @@ def test01c_kml(self):
  def test01d_errors(self):
  "Testing the Error handlers."
  # string-based
- print "\nBEGIN - expecting GEOS_ERROR; safe to ignore.\n"
+ print("\nBEGIN - expecting GEOS_ERROR; safe to ignore.\n")
  for err in self.geometries.errors:
  try:
  g = fromstr(err.wkt)
@@ -144,7 +144,7 @@ def test01d_errors(self):
  # Bad WKB
  self.assertRaises(GEOSException, GEOSGeometry, buffer('0'))
 
- print "\nEND - expecting GEOS_ERROR; safe to ignore.\n"
+ print("\nEND - expecting GEOS_ERROR; safe to ignore.\n")
 
  class NotAGeometry(object):
  pass
@@ -439,7 +439,7 @@ def test05a_polygons(self):
 
  def test05b_multipolygons(self):
  "Testing MultiPolygon objects."
- print "\nBEGIN - expecting GEOS_NOTICE; safe to ignore.\n"
+ print("\nBEGIN - expecting GEOS_NOTICE; safe to ignore.\n")
  prev = fromstr('POINT (0 0)')
  for mp in self.geometries.multipolygons:
  mpoly = fromstr(mp.wkt)
@@ -458,7 +458,7 @@ def test05b_multipolygons(self):
  self.assertEqual(p.valid, True)
  self.assertEqual(mpoly.wkt, MultiPolygon(*tuple(poly.clone() for poly in mpoly)).wkt)
 
- print "\nEND - expecting GEOS_NOTICE; safe to ignore.\n"
+ print("\nEND - expecting GEOS_NOTICE; safe to ignore.\n")
 
  def test06a_memory_hijinks(self):
  "Testing Geometry __del__() on rings and polygons."
@@ -995,15 +995,15 @@ def test27_valid_reason(self):
  self.assertTrue(isinstance(g.valid_reason, basestring))
  self.assertEqual(g.valid_reason, "Valid Geometry")
 
- print "\nBEGIN - expecting GEOS_NOTICE; safe to ignore.\n"
+ print("\nBEGIN - expecting GEOS_NOTICE; safe to ignore.\n")
 
  g = GEOSGeometry("LINESTRING(0 0, 0 0)")
 
  self.assertTrue(not g.valid)
  self.assertTrue(isinstance(g.valid_reason, basestring))
  self.assertTrue(g.valid_reason.startswith("Too few points in geometry component"))
 
- print "\nEND - expecting GEOS_NOTICE; safe to ignore.\n"
+ print("\nEND - expecting GEOS_NOTICE; safe to ignore.\n")
 
  def test28_geos_version(self):
  "Testing the GEOS version regular expression."