From: Markus Koschany <apo@debian.org>
Date: Tue, 12 Dec 2023 09:06:24 +0100
Subject: python3

Restore some of the old Python 3 patch by Reiner Herrmann. Not yet fixed
upstream.

Forwarded: no
---
 create-upload.py                |  4 ++--
 data/themes/default/generate.py |  2 +-
 data/themes/itheme/build.py     |  2 +-
 leveledit.py                    |  2 +-
 lib/pgu/algo.py                 |  8 ++++----
 lib/pgu/ani.py                  | 16 ++++++++--------
 lib/pgu/fonts.py                |  6 +++---
 lib/pgu/gui/slider.py           | 20 ++++++++++----------
 lib/pgu/html.py                 |  2 +-
 lib/pgu/layout.py               |  2 +-
 lib/pgu/text.py                 |  4 ++--
 lib/pgu/tilevid.py              | 26 +++++++++++++-------------
 run_game.py                     |  2 +-
 tileedit.py                     |  8 ++++----
 14 files changed, 52 insertions(+), 52 deletions(-)

--- a/create-upload.py
+++ b/create-upload.py
@@ -18,9 +18,9 @@
 import zipfile
 
 if len(sys.argv) != 2:
-    print '''Usage: python %s <release filename-version>
+    print('''Usage: python %s <release filename-version>
 
-eg. python %s my_cool_game-1.0'''%(sys.argv[0], sys.argv[0])
+eg. python %s my_cool_game-1.0'''%(sys.argv[0], sys.argv[0]))
     sys.exit()
 
 base = sys.argv[1]
--- a/data/themes/default/generate.py
+++ b/data/themes/default/generate.py
@@ -76,7 +76,7 @@
     ]
     
 for fname,img,over,ww,hh,s in todo:
-    print fname
+    print(fname)
     img,w,h = prep(img)
     out = pygame.Surface((ww*w,hh*h),SWSURFACE|SRCALPHA,32)
     out.fill((0,0,0,0))
--- a/data/themes/itheme/build.py
+++ b/data/themes/itheme/build.py
@@ -113,7 +113,7 @@
     ]
     
 for fname,img,over,ww,hh,s in todo:
-    print fname
+    print(fname)
     img,w,h = prep(img)
     out = pygame.Surface((ww*w,hh*h),SWSURFACE|SRCALPHA,32)
     out.fill((0,0,0,0))
--- a/leveledit.py
+++ b/leveledit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 """<title>a simple level editor for pygame</title>
 <pre>
 usage: leveledit level.tga [tiles.tga] [codes.tga] [tile_w] [tile_h]
--- a/lib/pgu/algo.py
+++ b/lib/pgu/algo.py
@@ -3,7 +3,7 @@
 <p>please note that this file is alpha, and is subject to modification in
 future versions of pgu!</p>
 """
-print 'pgu.algo','This module is alpha, and is subject to change.'
+print('pgu.algo','This module is alpha, and is subject to change.')
 
 #def dist(a,b):
 #    return abs(a[0]-b[0]) + abs(a[1]-b[1])
@@ -66,7 +66,7 @@
             lo = 0
             hi = len(opens)
             while lo < hi:
-                mid = (lo+hi)/2
+                mid = (lo+hi)//2
                 if new.f < opens[mid].f: hi = mid
                 else: lo = mid + 1
             opens.insert(lo,new)
@@ -110,13 +110,13 @@
     if dx >= dy:
         xi1,yi2 = 0,0
         d = dx
-        n = dx/2
+        n = dx//2
         a = dy
         p = dx
     else:
         xi2,yi1 = 0,0
         d = dy
-        n = dy/2
+        n = dy//2
         a = dx
         p = dy
         
--- a/lib/pgu/ani.py
+++ b/lib/pgu/ani.py
@@ -4,7 +4,7 @@
 future versions of pgu!</p>
 """
 
-print 'pgu.ani','This module is alpha, and is subject to change.'
+print('pgu.ani','This module is alpha, and is subject to change.')
 
 import math
 import pygame
@@ -14,12 +14,12 @@
     #print name,parts,l
     n = parts.pop()
     if len(parts):
-        s = l/n
-        for i in xrange(0,n):
+        s = l//n
+        for i in range(0,n):
             _ani_load(tv,name + ".%d"%i,parts[:],frames[s*i:s*(i+1)],shape)
         return
     
-    for i in xrange(0,n):
+    for i in range(0,n):
         tv.images[name+".%d"%i] = frames[i],shape
 
 def ani_load(tv,name,img,size,shape,parts):
@@ -43,8 +43,8 @@
     parts.reverse()
     w,h = size
     frames = []
-    for y in xrange(0,img.get_height(),h):
-        for x in xrange(0,img.get_width(),w):
+    for y in range(0,img.get_height(),h):
+        for x in range(0,img.get_width(),w):
             frames.append(img.subsurface(x,y,w,h))
     _ani_load(tv,name,parts,frames,shape)
     
@@ -71,13 +71,13 @@
         w2,h2 = img2.get_width(),img2.get_height()
         minx,miny,maxx,maxy = 1024,1024,0,0
         for x,y in ps:
-            x,y = x-w1/2,y-h1/2
+            x,y = x-w1//2,y-h1//2
             a2 = math.radians(a+diff)
             #NOTE: the + and - are switched from the normal formula because of
             #the weird way that pygame does the angle...
             x2 = x*math.cos(a2) + y*math.sin(a2) 
             y2 = y*math.cos(a2) - x*math.sin(a2)
-            x2,y2 = x2+w2/2,y2+h2/2
+            x2,y2 = x2+w2//2,y2+h2//2
             minx = min(minx,x2)
             miny = min(miny,y2)
             maxx = max(maxx,x2)
--- a/lib/pgu/fonts.py
+++ b/lib/pgu/fonts.py
@@ -4,7 +4,7 @@
 future versions of pgu!</p>
 """
 
-print 'pgu.fonts','This module is alpha, and is subject to change.'
+print('pgu.fonts','This module is alpha, and is subject to change.')
 
 import pygame
 from pygame.locals import *
@@ -73,8 +73,8 @@
             if c in self.chars:
                 if c not in colored:
                     img = self.chars[c].convert_alpha()
-                    for yy in xrange(0,th):
-                        for xx in xrange(0,tw):
+                    for yy in range(0,th):
+                        for xx in range(0,tw):
                             r,g,b,a = img.get_at((xx,yy))
                             if a > 128:
                                 img.set_at((xx,yy),color)
--- a/lib/pgu/gui/slider.py
+++ b/lib/pgu/gui/slider.py
@@ -32,10 +32,10 @@
         self.value = self.value
         r = pygame.rect.Rect(0,0,self.style.width,self.style.height)
         if self.orient == _SLIDER_HORIZONTAL:
-            r.x = (self.value-self.min) * (r.w-self.size) / max(1,self.max-self.min);
+            r.x = (self.value-self.min) * (r.w-self.size) // max(1,self.max-self.min);
             r.w = self.size;
         else:
-            r.y = (self.value-self.min) * (r.h-self.size) / max(1,self.max-self.min);
+            r.y = (self.value-self.min) * (r.h-self.size) // max(1,self.max-self.min);
             r.h = self.size;
             
         self.bar = r
@@ -65,10 +65,10 @@
                     rel = e.pos[0]-self.grab[0],e.pos[1]-self.grab[1]
                     if self.orient == _SLIDER_HORIZONTAL:
                         d = (r.w - self.size)
-                        if d != 0: self.value = self.grab_value + ((self.max-self.min) * rel[0] / d)
+                        if d != 0: self.value = self.grab_value + ((self.max-self.min) * rel[0] // d)
                     else:
                         d = (r.h - self.size)
-                        if d != 0: self.value = self.grab_value + ((self.max-self.min) * rel[1] / d)
+                        if d != 0: self.value = self.grab_value + ((self.max-self.min) * rel[1] // d)
                 else:
                     x,y,adj = e.pos[0],e.pos[1],1
                     
@@ -88,11 +88,11 @@
 
         if adj:
             if self.orient == _SLIDER_HORIZONTAL:
-                d = self.size/2 - (r.w/(self.max-self.min+1))/2
-                self.value = (x-d) * (self.max-self.min) / (r.w-self.size+1) + self.min
+                d = self.size//2 - (r.w//(self.max-self.min+1))//2
+                self.value = (x-d) * (self.max-self.min) // (r.w-self.size+1) + self.min
             else:
-                d = self.size/2 - (r.h/(self.max-self.min+1))/2
-                self.value = (y-d) * (self.max-self.min) / (r.h-self.size+1) + self.min
+                d = self.size//2 - (r.h//(self.max-self.min+1))//2
+                self.value = (y-d) * (self.max-self.min) // (r.h-self.size+1) + self.min
                 
         self.pcls = ""
         if self.container.myhover is self: self.pcls = "hover"
@@ -194,7 +194,7 @@
         ww += xr+xl
 
         self.slider.style.width = self.style.width - ww
-        setattr(self.slider,'size',self.size * self.slider.style.width / max(1,self.style.width))
+        setattr(self.slider,'size',self.size * self.slider.style.width // max(1,self.style.width))
         return table.Table.resize(self,width,height)
         
         
@@ -267,7 +267,7 @@
         hh += xt+xb
 
         self.slider.style.height = self.style.height - hh
-        setattr(self.slider,'size',self.size * self.slider.style.height / max(1,self.style.height))
+        setattr(self.slider,'size',self.size * self.slider.style.height // max(1,self.style.height))
         return table.Table.resize(self,width,height)
         
     def __setattr__(self,k,v):
--- a/lib/pgu/html.py
+++ b/lib/pgu/html.py
@@ -112,7 +112,7 @@
         return r
         
     def map_to_params(self,r):
-        anum = re.compile("\D")
+        anum = re.compile(r"\D")
         
         params = {'style':{}}
         style = params['style']
@@ -373,7 +373,7 @@
     def start_hr(self,attrs):
         self.do_hr(attrs)
     def do_hr(self,attrs):
-        h = self.font.size(" ")[1]/2
+        h = self.font.size(" ")[1]//2
         
         r = self.attrs_to_map(attrs)
         params = self.map_to_params(r)
@@ -429,7 +429,7 @@
         tst = re.compile("[\t\r\n]+").sub("",txt)
         if tst == "": return
         
-        txt = re.compile("\s+").sub(" ",txt)
+        txt = re.compile(r"\s+").sub(" ",txt)
         if txt == "": return
         
         if txt == " ":
--- a/lib/pgu/layout.py
+++ b/lib/pgu/layout.py
@@ -1,4 +1,4 @@
-print 'pgu.layout','Scheduled to be deprecated.'
+print('pgu.layout','Scheduled to be deprecated.')
 
 from pgu.gui.layout import *
 
--- a/lib/pgu/text.py
+++ b/lib/pgu/text.py
@@ -18,8 +18,8 @@
     <pre>writec(s,font,color,text,border=1)</pre>
     """
     w,h = font.size(text)
-    x = (s.get_width()-w)/2
-    y = (s.get_height()-h)/2
+    x = (s.get_width()-w)//2
+    y = (s.get_height()-h)//2
     write(s,font,(x,y),color,text,border)
     
 def writepre(s,font,rect,color,text):
--- a/lib/pgu/tilevid.py
+++ b/lib/pgu/tilevid.py
@@ -108,11 +108,11 @@
                  s.updated = 1
             if s.updated:
                 r = s._irect
-                y = max(0,r.y/th)
-                yy = min(h,r.bottom/th+1)
+                y = max(0,r.y//th)
+                yy = min(h,r.bottom//th+1)
                 while y < yy:
-                    x = max(0,r.x/tw)
-                    xx = min(w,r.right/tw+1)
+                    x = max(0,r.x//tw)
+                    xx = min(w,r.right//tw+1)
                     while x < xx:
                         if alayer[y][x] == 0:
                             self.updates.append((x,y))
@@ -121,11 +121,11 @@
                     y += 1
 
                 r = s.irect
-                y = max(0,r.y/th)
-                yy = min(h,r.bottom/th+1)
+                y = max(0,r.y//th)
+                yy = min(h,r.bottom//th+1)
                 while y < yy:
-                    x = r.x/tw
-                    xx = min(w,r.right/tw+1)
+                    x = r.x//tw
+                    xx = min(w,r.right//tw+1)
                     while x < xx:
                         if alayer[y][x]==0:
                             alayer[y][x]=2
@@ -139,11 +139,11 @@
         for s in sprites:
             if s.updated==0:
                 r = s.irect
-                y = max(0,r.y/th)
-                yy = min(h,r.bottom/th+1)
+                y = max(0,r.y//th)
+                yy = min(h,r.bottom//th+1)
                 while y < yy:
-                    x = max(0,r.x/tw)
-                    xx = min(w,r.right/tw+1)
+                    x = max(0,r.x//tw)
+                    xx = min(w,r.right//tw+1)
                     while x < xx:
                         if alayer[y][x]==1:
                             s.updated=1
@@ -174,7 +174,7 @@
         x,y = pos
         tiles = self.tiles
         tw,th = tiles[0].image.get_width(),tiles[0].image.get_height()
-        return x/tw,y/th
+        return x//tw,y//th
         
     def tile_to_view(self,pos):
         x,y = pos
--- a/run_game.py
+++ b/run_game.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import sys
 import os
--- a/tileedit.py
+++ b/tileedit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 """<title>a simple tile editor for pygame</title>
 <pre>
 
@@ -575,7 +575,7 @@
         cfg_to_ini(['tile_w','tile_h','palette'],app.fname)
         ini_save()
         app.dirty = 0
-    except Exception, v:
+    except Exception as v:
         ErrorDialog("Save failed.",v).open()
         return
     
@@ -616,7 +616,7 @@
             cfg['tile_w'] = tile_w
             cfg['tile_h'] = tile_h
             ok = 1
-        except Exception,v:
+        except Exception as v:
             ErrorDialog("Open failed.",v).open()
             
         if ok: raise Restart()
@@ -657,7 +657,7 @@
             cfg['tile_w'] = tile_w
             cfg['tile_h'] = tile_h
             ok = 1
-        except Exception, v:
+        except Exception as v:
             ErrorDialog("New failed.",v).open()
         if ok:
             raise Restart()
--- a/lib/pgu/gui/theme.py
+++ b/lib/pgu/gui/theme.py
@@ -103,7 +103,7 @@
                     vals = cfg.get(section,attr).strip().split()
                     self.config[cls+':'+pcls+' '+attr] = (dname,vals)
     
-    is_image = re.compile('\.(gif|jpg|bmp|png|tga)$', re.I)
+    is_image = re.compile('.(gif|jpg|bmp|png|tga)$', re.I)
     def _get(self,key):
         if not key in self.config: return
         if key in self.dict: return self.dict[key]