Commit c7d0ff0c authored by Tim Graham's avatar Tim Graham
Browse files

Fixed #20989 -- Removed explicit list comprehension inside dict() and tuple() 

Thanks jeroen.pulles at redslider.net for the suggestion and
helper script.
parent f19a3669

django/contrib/auth/hashers.py

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ def load_hashers(password_hashers=None): 
            raise ImproperlyConfigured("hasher doesn't specify an "

                                       "algorithm name: %s" % backend)

        hashers.append(hasher)

    HASHERS = dict([(hasher.algorithm, hasher) for hasher in hashers])

    HASHERS = dict((hasher.algorithm, hasher) for hasher in hashers)

    PREFERRED_HASHER = hashers[0]

django/contrib/gis/gdal/field.py

+1 −1
Original line number Diff line number Diff line
@@ -191,4 +191,4 @@ OGRFieldTypes = { 0 : OFTInteger, 
                 10 : OFTTime,

                 11 : OFTDateTime,

                  }

ROGRFieldTypes = dict([(cls, num) for num, cls in OGRFieldTypes.items()])
 
ROGRFieldTypes = dict((cls, num) for num, cls in OGRFieldTypes.items())

django/contrib/gis/gdal/geomtype.py

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class OGRGeomType(object): 
              7 + wkb25bit : 'GeometryCollection25D',

              }

    # Reverse type dictionary, keyed by lower-case of the name.

    _str_types = dict([(v.lower(), k) for k, v in _types.items()])

    _str_types = dict((v.lower(), k) for k, v in _types.items())



    def __init__(self, type_input):

        "Figures out the correct OGR Type based upon the input."

django/contrib/gis/gdal/libgdal.py

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ def gdal_version_info(): 
    ver = gdal_version().decode()

    m = version_regex.match(ver)

    if not m: raise OGRException('Could not parse GDAL version string "%s"' % ver)

    return dict([(key, m.group(key)) for key in ('major', 'minor', 'subminor')])

    return dict((key, m.group(key)) for key in ('major', 'minor', 'subminor'))



_verinfo = gdal_version_info()

GDAL_MAJOR_VERSION = int(_verinfo['major'])

django/contrib/gis/geometry/test_data.py

+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ TEST_DATA = os.path.join(os.path.dirname(upath(gis.__file__)), 'tests', 'data') 
def tuplize(seq):

    "Turn all nested sequences to tuples in given sequence."

    if isinstance(seq, (list, tuple)):

        return tuple([tuplize(i) for i in seq])

        return tuple(tuplize(i) for i in seq)

    return seq





def strconvert(d):

    "Converts all keys in dictionary to str type."

    return dict([(str(k), v) for k, v in six.iteritems(d)])

    return dict((str(k), v) for k, v in six.iteritems(d))





def get_ds_file(name, ext):