Commit e6ca15c1 authored by Ville Skyttä's avatar Ville Skyttä Committed by Tim Graham
Browse files

Passed logging message parameters as arguments instead of interpolating them.

parent 62ca2dea

django/contrib/gis/admin/widgets.py

+3 −6
Original line number Diff line number Diff line
@@ -35,10 +35,7 @@ class OpenLayersWidget(Textarea): 
            try:

                value = GEOSGeometry(value)

            except (GEOSException, ValueError) as err:

                logger.error(

                    "Error creating geometry from value '%s' (%s)" % (

                        value, err)

                )

                logger.error("Error creating geometry from value '%s' (%s)", value, err)

                value = None



        if (value and value.geom_type.upper() != self.geom_type and
@@ -68,8 +65,8 @@ class OpenLayersWidget(Textarea): 
                    wkt = ogr.wkt

                except GDALException as err:

                    logger.error(

                        "Error transforming geometry from srid '%s' to srid '%s' (%s)" % (

                            value.srid, srid, err)

                        "Error transforming geometry from srid '%s' to srid '%s' (%s)",

                        value.srid, srid, err

                    )

                    wkt = ''

            else:

django/contrib/gis/db/backends/mysql/schema.py

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ class MySQLGISSchemaEditor(DatabaseSchemaEditor): 
            except OperationalError:

                logger.error(

                    "Couldn't remove spatial index: %s (may be expected "

                    "if your storage engine doesn't support them)." % sql

                    "if your storage engine doesn't support them).", sql

                )



        super(MySQLGISSchemaEditor, self).remove_field(model, field)
@@ -72,6 +72,6 @@ class MySQLGISSchemaEditor(DatabaseSchemaEditor): 
            except OperationalError:

                logger.error(

                    "Cannot create SPATIAL INDEX %s. Only MyISAM and (as of "

                    "MySQL 5.7.5) InnoDB support them." % sql

                    "MySQL 5.7.5) InnoDB support them.", sql

                )

        self.geometry_sql = []

django/contrib/gis/forms/widgets.py

+3 −6
Original line number Diff line number Diff line
@@ -40,10 +40,7 @@ class BaseGeometryWidget(Widget): 
        try:

            return GEOSGeometry(value, self.map_srid)

        except (GEOSException, ValueError) as err:

            logger.error(

                "Error creating geometry from value '%s' (%s)" % (

                    value, err)

            )

            logger.error("Error creating geometry from value '%s' (%s)", value, err)

        return None



    def render(self, name, value, attrs=None):
@@ -61,8 +58,8 @@ class BaseGeometryWidget(Widget): 
                    value = ogr

                except gdal.GDALException as err:

                    logger.error(

                        "Error transforming geometry from srid '%s' to srid '%s' (%s)" % (

                            value.srid, self.map_srid, err)

                        "Error transforming geometry from srid '%s' to srid '%s' (%s)",

                        value.srid, self.map_srid, err

                    )



        context = self.build_attrs(

django/contrib/gis/gdal/libgdal.py

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ CPLErrorHandler = CFUNCTYPE(None, c_int, c_int, c_char_p) 




def err_handler(error_class, error_number, message):

    logger.error('GDAL_ERROR %d: %s' % (error_number, message))

    logger.error('GDAL_ERROR %d: %s', error_number, message)

err_handler = CPLErrorHandler(err_handler)

django/contrib/gis/geos/libgeos.py

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ def notice_h(fmt, lst): 
        warn_msg = fmt % lst

    except TypeError:

        warn_msg = fmt

    logger.warning('GEOS_NOTICE: %s\n' % warn_msg)

    logger.warning('GEOS_NOTICE: %s\n', warn_msg)

notice_h = NOTICEFUNC(notice_h)



ERRORFUNC = CFUNCTYPE(None, c_char_p, c_char_p)
@@ -96,7 +96,7 @@ def error_h(fmt, lst): 
        err_msg = fmt % lst

    except TypeError:

        err_msg = fmt

    logger.error('GEOS_ERROR: %s\n' % err_msg)

    logger.error('GEOS_ERROR: %s\n', err_msg)

error_h = ERRORFUNC(error_h)



# #### GEOS Geometry C data structures, and utility functions. ####