nur-packages

My NUR packages
git clone git://git.sikmir.ru/nur-packages
Log | Files | Refs | README | LICENSE

python3.patch (1597B)


      1 diff --git i/tiles_update.py w/tiles_update.py
      2 index 2d73b9a..88be9da 100755
      3 --- i/tiles_update.py
      4 +++ w/tiles_update.py
      5 @@ -124,10 +124,10 @@ class JobManager(object):
      6          fingerprint = maprecord.fingerprint
      7          attrib_filename = attribution.get_attrib_path(maprecord.image_path)
      8          if os.path.exists(attrib_filename):
      9 -            fingerprint = hashlib.sha1(fingerprint)
     10 -            fingerprint.update(':~:' + open(attrib_filename).read())
     11 +            fingerprint = hashlib.sha1(str(fingerprint).encode('utf-8'))
     12 +            fingerprint.update(str(':~:' + open(attrib_filename).read()).encode('utf-8'))
     13              info_filename = attribution.get_info_path(maprecord.image_path)
     14 -            fingerprint.update(':~:' + open(info_filename).read())
     15 +            fingerprint.update(str(':~:' + open(info_filename).read()).encode('utf-8'))
     16              fingerprint = fingerprint.hexdigest()
     17          return fingerprint
     18  
     19 @@ -225,8 +225,8 @@ def get_reprojected_image(tile_x, tile_y, level, map_reference):
     20          src_has_alpha = True
     21      cell_size = 64
     22      mesh = []
     23 -    for cell_x in xrange(tile_size / cell_size):
     24 -        for cell_y in xrange(tile_size / cell_size):
     25 +    for cell_x in xrange(int(tile_size / cell_size)):
     26 +        for cell_y in xrange(int(tile_size / cell_size)):
     27              x1 = cell_x * cell_size
     28              y1 = cell_y * cell_size
     29              x2 = x1 + cell_size
     30 @@ -370,7 +370,7 @@ def build_overviews(altered_tiles):
     31  
     32  
     33  def filename_arg_type(s):
     34 -    return s.decode(sys.getfilesystemencoding())
     35 +    return s
     36  
     37  
     38  def parse_image_format(s):