Mercurial > mamba
changeset 589:fca61cd8fc33
Start working towards py3 port
| author | Neil Muller <drnlmuller@gmail.com> |
|---|---|
| date | Wed, 11 Jan 2023 20:29:36 +0200 |
| parents | 636e28b2e43a |
| children | 2d3dee657638 |
| files | mamba/forest.py mamba/habitats/editor.py mamba/habitats/userlevelmenu.py mamba/options.py mamba/sound.py scripts/convert_old_level scripts/partition_helper scripts/upload_level scripts/validate_level |
| diffstat | 9 files changed, 36 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/mamba/forest.py Wed Mar 18 14:17:46 2020 -0700 +++ b/mamba/forest.py Wed Jan 11 20:29:36 2023 +0200 @@ -4,14 +4,14 @@ from flask import Flask, request, abort from datetime import datetime -from ConfigParser import SafeConfigParser +from ConfigParser import ConfigParser import xmlrpclib import time import os import sys import socket import json -import StringIO +from io import StringIO import zipfile app = Flask(__name__) @@ -56,7 +56,7 @@ level.write(leveldata) def zip_levels(self): - levels_raw = StringIO.StringIO() + levels_raw = StringIO() levels_zip = zipfile.ZipFile( levels_raw, "w", compression=zipfile.ZIP_DEFLATED) for levelname in self.list_levels(): @@ -226,7 +226,7 @@ """Holder for sub-config.""" def __init__(self, filenames): - self._config = SafeConfigParser() + self._config = ConfigParser() self._config.read(filenames) self.main = self._parse("main") self.irker = self._parse("irker") @@ -286,7 +286,7 @@ if __name__ == "__main__": if len(sys.argv) != 2: - print USAGE + print(USAGE) sys.exit(1) app.config.forest = ForestConfig([sys.argv[1]]) @@ -297,7 +297,7 @@ if not os.path.exists(folder): os.makedirs(folder) if not os.path.isdir(folder): - print "Level folder must be a folder." + print("Level folder must be a folder.") sys.exit(1) cia_project = sys.argv[3] if len(sys.argv) > 3 else None
--- a/mamba/habitats/editor.py Wed Mar 18 14:17:46 2020 -0700 +++ b/mamba/habitats/editor.py Wed Jan 11 20:29:36 2023 +0200 @@ -461,7 +461,7 @@ return True def change_tileset(self, new_tileset): - print "changing tileset" + print("changing tileset") self.level.update_tiles_ascii() old_tileset = self.level.tileset try:
--- a/mamba/habitats/userlevelmenu.py Wed Mar 18 14:17:46 2020 -0700 +++ b/mamba/habitats/userlevelmenu.py Wed Jan 11 20:29:36 2023 +0200 @@ -30,7 +30,7 @@ source = self._url_data("level/%s" % name) level = Level(name, self.level_namespace, source) except: - print "Failed to download online level %r" % name + print("Failed to download online level %r" % name) return self.cache[name] = level @@ -38,7 +38,7 @@ try: data = self._url_data("index") except: - print "Failed to download online level index." + print("Failed to download online level index.") return levels = [x.strip() for x in data.splitlines()] @@ -49,7 +49,7 @@ try: data = self._url_data("levels.zip") except: - print "Failed to download online level zip." + print("Failed to download online level zip.") return level_zip = zipfile.ZipFile(StringIO.StringIO(data), "r") levels = level_zip.namelist() @@ -58,7 +58,7 @@ source = level_zip.read(level) self.cache[level] = Level(level, self.level_namespace, source) except: - print "Failed to parse online level %r" % level + print("Failed to parse online level %r" % level) def list_levels(self): if not self.cache: @@ -70,11 +70,11 @@ def print_levels(self): title = "%s levels:" % self.ctype.title() - print title - print "=" * len(title) + print(title) + print("=" * len(title)) for name in self.list_levels(): - print name - print "=" * len(title) + print(name) + print("=" * len(title)) def get_level(self, name): if name not in self.cache: @@ -113,7 +113,7 @@ self.get_level(name) self._level_list.append(name) except: - print "Invalid user level:", name + print("Invalid user level:", name) return self._level_list[:] def get_level(self, name):
--- a/mamba/options.py Wed Mar 18 14:17:46 2020 -0700 +++ b/mamba/options.py Wed Jan 11 20:29:36 2023 +0200 @@ -68,7 +68,7 @@ def check_args(options=options): """Check options and complain if they're invalid.""" if options.edit and options.level is None: - print "You must supply --level when using --edit." + print("You must supply --level when using --edit.") return False return True
--- a/mamba/sound.py Wed Mar 18 14:17:46 2020 -0700 +++ b/mamba/sound.py Wed Jan 11 20:29:36 2023 +0200 @@ -61,7 +61,7 @@ test_sound.play() self.sound_enabled = True except pygame.error: - print 'Unable to enable sound. Continuing without sound' + print('Unable to enable sound. Continuing without sound') self.sound_enabled = False self._sounds = {} _SOUND_SYSTEM = self @@ -74,7 +74,7 @@ mixer.music.play(-1) # Loop sound mixer.music.set_volume(volume) except: - print 'Unable to load track %s. Skipping' % track_name + print('Unable to load track %s. Skipping' % track_name) def stop_music(self): """Stop music""" @@ -93,7 +93,7 @@ if not os.path.exists(track_name): # Pygame doesn't error out for missing files, so # handle that ourselves - print "Can't find sound %s. Skipping" % track_name + print("Can't find sound %s. Skipping" % track_name) self._sounds[key] = None return try: @@ -101,7 +101,7 @@ if volume is not None: self._sounds[key].set_volume(volume) except: - print 'Unable to load sound %s. Skipping' % track_name + print('Unable to load sound %s. Skipping' % track_name) self._sounds[key] = None def play_sound(self, key):
--- a/scripts/convert_old_level Wed Mar 18 14:17:46 2020 -0700 +++ b/scripts/convert_old_level Wed Jan 11 20:29:36 2023 +0200 @@ -5,7 +5,7 @@ mapfile=sys.argv[1] if mapfile == 'index.txt': - print 'Skipping index.txt' + print('Skipping index.txt') sys.exit(0) f=open(mapfile, 'rU') @@ -13,7 +13,7 @@ f.close() if lines[0].strip() == 'Version: 0.2.0': - print "%s already converted" % mapfile + print("%s already converted" % mapfile) sys.exit(0) out=open(mapfile, 'w') @@ -25,4 +25,4 @@ out.write(''.join(lines[3:])) out.close() -print 'Converted: %s' % mapfile +print('Converted: %s' % mapfile)
--- a/scripts/partition_helper Wed Mar 18 14:17:46 2020 -0700 +++ b/scripts/partition_helper Wed Jan 11 20:29:36 2023 +0200 @@ -48,7 +48,7 @@ height.extend([""] * 6) height = [l.ljust(50) for l in height] pairs = zip(height, width) - print "\n".join(["%s %s" % p for p in pairs]) + print("\n".join(["%s %s" % p for p in pairs])) def make_partition(height, width): sepheight, hparts = height
--- a/scripts/upload_level Wed Mar 18 14:17:46 2020 -0700 +++ b/scripts/upload_level Wed Jan 11 20:29:36 2023 +0200 @@ -6,8 +6,8 @@ if __name__ == "__main__": if len(sys.argv) != 3: - print 'Usage' - print '%s <level name> <level file>' % sys.argv[0] + print('Usage') + print('%s <level name> <level file>' % sys.argv[0]) sys.exit(1) level_name = sys.argv[1] level_filename = sys.argv[2] @@ -16,8 +16,8 @@ data = level_file.read() url = "http://ctpug.org.za/mamba/save/%s" % level_name - print "Uploading to", url, "..." + print("Uploading to", url, "...") args = urllib.urlencode([('data', data)]) result = urllib2.urlopen(url, args) - print result.read() + print(result.read())
--- a/scripts/validate_level Wed Mar 18 14:17:46 2020 -0700 +++ b/scripts/validate_level Wed Jan 11 20:29:36 2023 +0200 @@ -5,19 +5,19 @@ if __name__ == "__main__": if len(sys.argv) == 1: - print 'Usage' - print '%s <level name>' % sys.argv[0] + print('Usage') + print('%s <level name>' % sys.argv[0]) sys.exit(1) level_name = ' '.join(sys.argv[1:]) try: level = Level(level_name) except InvalidMapError, error: - print 'Map validation failed' - print 'Exception: %s' % error + print('Map validation failed') + print('Exception: %s' % error) sys.exit(1) except IOError, error: - print "Unable to load some resources for the level" - print "Exception: %s" % error + print("Unable to load some resources for the level") + print("Exception: %s" % error) sys.exit(1) - print 'Level OK' + print('Level OK')