From 53051b7cace8db3ec948349e0538e393e4af6860 Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Tue, 4 Jun 2024 14:15:47 +0000 Subject: Very basic python3 support Extremely minimal, not touching any __future__ imports or such. For serious use, see specing's WIP PR at: https://git.themanaworld.org/legacy/tmwa/-/merge_requests/256 --- tools/bs-align | 2 +- tools/colorize | 2 +- tools/config.py | 2 +- tools/debug-debug-scripts | 8 +++++++- tools/indenter | 2 +- tools/pp-indent | 2 +- tools/protocol.py | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/bs-align b/tools/bs-align index 6582298..0caf649 100755 --- a/tools/bs-align +++ b/tools/bs-align @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 ## bs-align.py - Filter to align trailing line continuations ## diff --git a/tools/colorize b/tools/colorize index ce6f410..849fb61 100755 --- a/tools/colorize +++ b/tools/colorize @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function diff --git a/tools/config.py b/tools/config.py index f87fe77..a2645d8 100755 --- a/tools/config.py +++ b/tools/config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # coding: utf-8 # config.py - generator for config file parsers diff --git a/tools/debug-debug-scripts b/tools/debug-debug-scripts index 2112a6e..cfdc31f 100755 --- a/tools/debug-debug-scripts +++ b/tools/debug-debug-scripts @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # encoding: utf-8 from __future__ import print_function @@ -35,6 +35,12 @@ error = False def eprint(s): print('Error:', s, file=sys.stderr) +# Implement an equivalent to Python 2's execfile for Python 3 +def execfile(filename, globals=None, locals=None): + with open(filename, 'r') as f: + code = compile(f.read(), filename, 'exec') + exec(code, globals, locals) + def get_classes_from_file(a): global error d = {} diff --git a/tools/indenter b/tools/indenter index 0d93543..f7c1657 100755 --- a/tools/indenter +++ b/tools/indenter @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 ## indenter.py - Top-level indenter for all files ## diff --git a/tools/pp-indent b/tools/pp-indent index 9be9a03..622614a 100755 --- a/tools/pp-indent +++ b/tools/pp-indent @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 ## pp-indent - Filter to apply indentation to preprocessor statements ## diff --git a/tools/protocol.py b/tools/protocol.py index cf89a16..d63c22d 100755 --- a/tools/protocol.py +++ b/tools/protocol.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # coding: utf-8 # protocol.py - generator for entire TMWA network protocol -- cgit v1.2.3-70-g09d2 From 7c80d10503545cc870c084def44c0ea4a95fd290 Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Tue, 4 Jun 2024 14:16:59 +0000 Subject: Rename .make to .mk .mk is more widely understood than .make, for IDE usage. --- COPYING | 2 +- Makefile.in | 14 +++++++------- README.md | 2 +- generate.make | 42 ---------------------------------------- generate.mk | 42 ++++++++++++++++++++++++++++++++++++++++ tools/protocol.py | 2 +- version.make | 58 ------------------------------------------------------- version.mk | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 110 insertions(+), 110 deletions(-) delete mode 100644 generate.make create mode 100644 generate.mk delete mode 100644 version.make create mode 100644 version.mk (limited to 'tools') diff --git a/COPYING b/COPYING index edf98ab..c1c13ff 100644 --- a/COPYING +++ b/COPYING @@ -5,7 +5,7 @@ This combination is explicitly allowed by section 13 of the licenses. See gpl-3.0.txt or agpl-3.0.txt for specific terms. In order to make life easy for users who run this software publicly, -please set VENDOR_SOURCE in version.make if you make any modifications. +please set VENDOR_SOURCE in version.mk if you make any modifications. History: diff --git a/Makefile.in b/Makefile.in index 6fe2de6..75f91f7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -152,7 +152,7 @@ $(info The Road goes ever on and on ...) endif endif -include ${SRC_DIR}/version.make +include ${SRC_DIR}/version.mk ifeq (${ENABLE_SHARED},yes) LIB_SUFFIX_FAKE := so @@ -184,7 +184,7 @@ export PATH:=$(realpath ${SRC_DIR}/tools):${PATH} SHELL=bash # need to generate source files before path lists -$(shell make -f ${SRC_DIR}/generate.make >&2) +$(shell make -f ${SRC_DIR}/generate.mk >&2) stamp/generated.stamp: # if you get here, the shell above failed false @@ -688,15 +688,15 @@ override CPPFLAGS += -I . -I ${SRC_DIR}/include # distribution tarballs # this only works from within a git checkout -dist/%/version.make: +dist/%/version.mk: $(MKDIR_FIRST) - git --git-dir=${SRC_DIR}/.git show HEAD:version.make > $@ + git --git-dir=${SRC_DIR}/.git show HEAD:version.mk > $@ sed 's/^VERSION_FULL := .*/#&\nVERSION_FULL := ${VERSION_FULL}/' -i $@ sed 's/^VERSION_HASH := .*/#&\nVERSION_HASH := ${VERSION_HASH}/' -i $@ -dist/%-src.tar: dist/%/version.make +dist/%-src.tar: dist/%/version.mk git --git-dir=${SRC_DIR}/.git archive --prefix=$*/ -o $@ HEAD - ( mtime="$$(git --git-dir=${SRC_DIR}/.git log -n1 --pretty=%ci)" && cd dist && tar uf $*-src.tar --mtime="$${mtime}" --mode=664 --owner=root --group=root $*/version.make ) - rm dist/$*/version.make + ( mtime="$$(git --git-dir=${SRC_DIR}/.git log -n1 --pretty=%ci)" && cd dist && tar uf $*-src.tar --mtime="$${mtime}" --mode=664 --owner=root --group=root $*/version.mk ) + rm dist/$*/version.mk rmdir dist/$*/ dist/%-attoconf-only.tar: $(MKDIR_FIRST) diff --git a/README.md b/README.md index b2309f5..6de796f 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ attoconf), but for any discussions related to TMW development. ## 1. Distributors. ### Important notes: -- Go read [version.make](version.make) +- Go read [version.mk](version.mk) - TMWA requires git to build by default, use 'make dist' to get a tarball. ### Platform dependencies: diff --git a/generate.make b/generate.make deleted file mode 100644 index c32ca8d..0000000 --- a/generate.make +++ /dev/null @@ -1,42 +0,0 @@ -SHELL=bash - -MKDIR_FIRST = @mkdir -p ${@D} -SRC_DIR := $(patsubst %/,%,$(dir ${MAKEFILE_LIST})) -PIES := $(shell cd ${SRC_DIR}; find src/ -name '*.py') -PIES := $(filter-out src/main-gdb-%.py,${PIES}) - -export PATH:=$(realpath ${SRC_DIR}/tools):${PATH} - -vpath %.cpp ${SRC_DIR} -vpath %.hpp ${SRC_DIR} -vpath %.tcc ${SRC_DIR} -vpath tools/% ${SRC_DIR} -vpath %.py ${SRC_DIR} - -stamp/generated.stamp: - $(MKDIR_FIRST) - touch $@ - -stamp/generated.stamp: stamp/generate-proto2.stamp -stamp/generate-proto2.stamp: tools/protocol.py - $(MKDIR_FIRST) - rm -f stamp/generated.stamp - mkdir -p ${SRC_DIR}/src/proto2 - cd ${SRC_DIR} && protocol.py - touch $@ - -stamp/generated.stamp: stamp/generate-debug-debug.stamp -stamp/generate-debug-debug.stamp: tools/debug-debug-scripts ${PIES} - $(MKDIR_FIRST) - rm -f stamp/generated.stamp - mkdir -p ${SRC_DIR}/src/debug-debug - rm -f ${SRC_DIR}/src/debug-debug/test.cpp - debug-debug-scripts ${SRC_DIR}/src/debug-debug/ $(wordlist 2,$(words $^),$^) - touch $@ - -stamp/generated.stamp: stamp/generate-config.stamp -stamp/generate-config.stamp: tools/config.py - $(MKDIR_FIRST) - rm -f stamp/generated.stamp - cd ${SRC_DIR} && config.py - touch $@ diff --git a/generate.mk b/generate.mk new file mode 100644 index 0000000..c32ca8d --- /dev/null +++ b/generate.mk @@ -0,0 +1,42 @@ +SHELL=bash + +MKDIR_FIRST = @mkdir -p ${@D} +SRC_DIR := $(patsubst %/,%,$(dir ${MAKEFILE_LIST})) +PIES := $(shell cd ${SRC_DIR}; find src/ -name '*.py') +PIES := $(filter-out src/main-gdb-%.py,${PIES}) + +export PATH:=$(realpath ${SRC_DIR}/tools):${PATH} + +vpath %.cpp ${SRC_DIR} +vpath %.hpp ${SRC_DIR} +vpath %.tcc ${SRC_DIR} +vpath tools/% ${SRC_DIR} +vpath %.py ${SRC_DIR} + +stamp/generated.stamp: + $(MKDIR_FIRST) + touch $@ + +stamp/generated.stamp: stamp/generate-proto2.stamp +stamp/generate-proto2.stamp: tools/protocol.py + $(MKDIR_FIRST) + rm -f stamp/generated.stamp + mkdir -p ${SRC_DIR}/src/proto2 + cd ${SRC_DIR} && protocol.py + touch $@ + +stamp/generated.stamp: stamp/generate-debug-debug.stamp +stamp/generate-debug-debug.stamp: tools/debug-debug-scripts ${PIES} + $(MKDIR_FIRST) + rm -f stamp/generated.stamp + mkdir -p ${SRC_DIR}/src/debug-debug + rm -f ${SRC_DIR}/src/debug-debug/test.cpp + debug-debug-scripts ${SRC_DIR}/src/debug-debug/ $(wordlist 2,$(words $^),$^) + touch $@ + +stamp/generated.stamp: stamp/generate-config.stamp +stamp/generate-config.stamp: tools/config.py + $(MKDIR_FIRST) + rm -f stamp/generated.stamp + cd ${SRC_DIR} && config.py + touch $@ diff --git a/tools/protocol.py b/tools/protocol.py index d63c22d..08c82b2 100755 --- a/tools/protocol.py +++ b/tools/protocol.py @@ -7124,7 +7124,7 @@ def make_dots(ctx): #p = partition({k: ids_only(v.post) for (k, v) in d.items()}) if not os.path.exists('doc-gen'): - # generate.make will succeed if missing the wiki repo + # generate.mk will succeed if missing the wiki repo # but 'make doc' will fail return for g in glob.glob('doc-gen/*.gv'): diff --git a/version.make b/version.make deleted file mode 100644 index 73ecc83..0000000 --- a/version.make +++ /dev/null @@ -1,58 +0,0 @@ -ABI_VERSION := 0 - -# These lines are automatically replaced in tarballs generated by 'make dist' -# Note so you stop forgetting: export-subst attribute can't do tag-relative -VERSION_FULL := $(shell git --git-dir=${SRC_DIR}/.git describe --tags HEAD) -VERSION_HASH := $(shell git --git-dir=${SRC_DIR}/.git rev-parse HEAD) - -version_bits := $(subst v, ,$(subst -, ,$(subst ., ,${VERSION_FULL}))) -# Note: these four numbers are limited to 255. -# Currently, my tags are yy.mm.dd instead of semantic versioning. -# The dev number is how many commits since the last tag. -VERSION_MAJOR := $(word 1,${version_bits}) -VERSION_MINOR := $(word 2,${version_bits}) -VERSION_PATCH := $(word 3,${version_bits}) -VERSION_DEVEL := $(word 4,${version_bits}) -ifeq "${VERSION_DEVEL}" "" - VERSION_DEVEL := 0 -endif - - - -# Settings for those distributing modified versions. -# -# It is strongly recommended that all distributors set these, -# but the only *requirement* is that modified versions that are run -# (semi)publicly give VENDOR_SOURCE to satisfy section 13 of the AGPLv3. - -# TODO should these be passed to configure instead? - -# Vendor Name: String (no newlines, no parentheses) -# This is usually one word, and does not (usually) change over time. -# (Examples: Gentoo, Debian, Fedora, Ubuntu) -VENDOR_NAME := Vanilla -# Vendor Point: Integer (max value 65535) -# This is intended to be the "packaging revision number", assuming that's -# an integer. At a minimum, please try to make it nonzero if you have -# any non-upstream patches (unconditionally nonzero is also okay). -# (If your revision 0 package has patches ... please be nicer to upstream) -VENDOR_POINT := 0 -# URL where the source may be found (after searching for version number). -# See AGPLv3 section 13 -VENDOR_SOURCE := https://github.com/themanaworld/tmwa - -# Convenience -VERSION_STRING := TMWA ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} dev${VERSION_DEVEL} +${VENDOR_POINT} (${VENDOR_NAME}) -VERSION_DOTS := ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_DEVEL}.${VENDOR_POINT} - -# Shared libraries -SO_SHORT := so.${ABI_VERSION} -SO_LONG := ${SO_SHORT}.${VERSION_DOTS} -# and thanks for all the fish - -version: - @echo version '${VERSION_STRING}' - @echo based on commit ${VERSION_FULL} aka ${VERSION_HASH} - @echo source ${VENDOR_SOURCE} - @echo abi version ${ABI_VERSION} - @echo 'lib so -> ${SO_SHORT} -> ${SO_LONG}' diff --git a/version.mk b/version.mk new file mode 100644 index 0000000..73ecc83 --- /dev/null +++ b/version.mk @@ -0,0 +1,58 @@ +ABI_VERSION := 0 + +# These lines are automatically replaced in tarballs generated by 'make dist' +# Note so you stop forgetting: export-subst attribute can't do tag-relative +VERSION_FULL := $(shell git --git-dir=${SRC_DIR}/.git describe --tags HEAD) +VERSION_HASH := $(shell git --git-dir=${SRC_DIR}/.git rev-parse HEAD) + +version_bits := $(subst v, ,$(subst -, ,$(subst ., ,${VERSION_FULL}))) +# Note: these four numbers are limited to 255. +# Currently, my tags are yy.mm.dd instead of semantic versioning. +# The dev number is how many commits since the last tag. +VERSION_MAJOR := $(word 1,${version_bits}) +VERSION_MINOR := $(word 2,${version_bits}) +VERSION_PATCH := $(word 3,${version_bits}) +VERSION_DEVEL := $(word 4,${version_bits}) +ifeq "${VERSION_DEVEL}" "" + VERSION_DEVEL := 0 +endif + + + +# Settings for those distributing modified versions. +# +# It is strongly recommended that all distributors set these, +# but the only *requirement* is that modified versions that are run +# (semi)publicly give VENDOR_SOURCE to satisfy section 13 of the AGPLv3. + +# TODO should these be passed to configure instead? + +# Vendor Name: String (no newlines, no parentheses) +# This is usually one word, and does not (usually) change over time. +# (Examples: Gentoo, Debian, Fedora, Ubuntu) +VENDOR_NAME := Vanilla +# Vendor Point: Integer (max value 65535) +# This is intended to be the "packaging revision number", assuming that's +# an integer. At a minimum, please try to make it nonzero if you have +# any non-upstream patches (unconditionally nonzero is also okay). +# (If your revision 0 package has patches ... please be nicer to upstream) +VENDOR_POINT := 0 +# URL where the source may be found (after searching for version number). +# See AGPLv3 section 13 +VENDOR_SOURCE := https://github.com/themanaworld/tmwa + +# Convenience +VERSION_STRING := TMWA ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} dev${VERSION_DEVEL} +${VENDOR_POINT} (${VENDOR_NAME}) +VERSION_DOTS := ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_DEVEL}.${VENDOR_POINT} + +# Shared libraries +SO_SHORT := so.${ABI_VERSION} +SO_LONG := ${SO_SHORT}.${VERSION_DOTS} +# and thanks for all the fish + +version: + @echo version '${VERSION_STRING}' + @echo based on commit ${VERSION_FULL} aka ${VERSION_HASH} + @echo source ${VENDOR_SOURCE} + @echo abi version ${ABI_VERSION} + @echo 'lib so -> ${SO_SHORT} -> ${SO_LONG}' -- cgit v1.2.3-70-g09d2 From 36562d847999730634663d8a80c3cfdff36bd027 Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Wed, 5 Jun 2024 20:05:31 +0000 Subject: python3: Strip old __future__ references --- configure | 2 -- tools/colorize | 2 -- tools/config.py | 2 -- tools/debug-debug-scripts | 1 - tools/indenter | 1 - tools/protocol.py | 2 -- 6 files changed, 10 deletions(-) (limited to 'tools') diff --git a/configure b/configure index 7a7a9ef..31c0c47 100755 --- a/configure +++ b/configure @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with attoconf. If not, see . -from __future__ import print_function, division, absolute_import - import os import sys diff --git a/tools/colorize b/tools/colorize index 849fb61..205a1bc 100755 --- a/tools/colorize +++ b/tools/colorize @@ -1,7 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function - import os import sys diff --git a/tools/config.py b/tools/config.py index a2645d8..ce61440 100755 --- a/tools/config.py +++ b/tools/config.py @@ -20,8 +20,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from __future__ import print_function - import glob import os diff --git a/tools/debug-debug-scripts b/tools/debug-debug-scripts index cfdc31f..5ba7ecb 100755 --- a/tools/debug-debug-scripts +++ b/tools/debug-debug-scripts @@ -1,6 +1,5 @@ #!/usr/bin/env python3 # encoding: utf-8 -from __future__ import print_function copyright = ''' // Copyright © 2014 Ben Longbons diff --git a/tools/indenter b/tools/indenter index f7c1657..1d44581 100755 --- a/tools/indenter +++ b/tools/indenter @@ -20,7 +20,6 @@ ## along with this program. If not, see . -from __future__ import print_function from collections import namedtuple import cStringIO diff --git a/tools/protocol.py b/tools/protocol.py index 08c82b2..86515d2 100755 --- a/tools/protocol.py +++ b/tools/protocol.py @@ -20,8 +20,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from __future__ import print_function - import glob import itertools import os -- cgit v1.2.3-70-g09d2 From f5500cd949e6db20813c3bbec9cef66284866209 Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Wed, 5 Jun 2024 20:08:39 +0000 Subject: python3: Update names - unicode -> str - u'' -> '' - cStringIO -> io Sourced from specing's work on the porting process. See https://git.themanaworld.org/legacy/tmwa/-/merge_requests/256 --- tools/indenter | 4 +- tools/protocol.py | 109 ++++++++++++++++++++++++++---------------------------- 2 files changed, 54 insertions(+), 59 deletions(-) (limited to 'tools') diff --git a/tools/indenter b/tools/indenter index 1d44581..ee000da 100755 --- a/tools/indenter +++ b/tools/indenter @@ -22,7 +22,7 @@ from collections import namedtuple -import cStringIO +import io import string import subprocess import sys @@ -113,7 +113,7 @@ class Reader(object): self._column += 1 def string_reader(s, name='', line=1, column=1): - return Reader(name, cStringIO.StringIO(s), line, column) + return Reader(name, io.StringIO(s), line, column) def take_while(b, r, s): assert isinstance(b, bytearray) diff --git a/tools/protocol.py b/tools/protocol.py index 86515d2..8059c59 100755 --- a/tools/protocol.py +++ b/tools/protocol.py @@ -27,11 +27,6 @@ from pipes import quote from posixpath import relpath from weakref import ref as wr -try: - unicode -except NameError: - unicode = str - ## For various reasons this is all one file, so let's navigate with a ## ## Table of Contents @@ -114,30 +109,30 @@ class OpenWrite(object): # TOC_ def gvq(s): - return u'"%s"' % s.replace(u'"', u'\\"') + return '"%s"' % s.replace('"', '\\"') def gva(d): if d: - return u' [%s]' % u', '.join(u'%s=%s' % (ak, gvq(av)) for (ak, av) in sorted(d.items())) - return u'' + return ' [%s]' % ', '.join('%s=%s' % (ak, gvq(av)) for (ak, av) in sorted(d.items())) + return '' class Attributes(object): - __slots__ = (u'_attributes') + __slots__ = ('_attributes') def __init__(self): self._attributes = {} def __getitem__(self, k): - assert isinstance(k, unicode) + assert isinstance(k, str) return self._attributes[k] def __setitem__(self, k, v): - assert isinstance(k, unicode) - assert isinstance(v, unicode) + assert isinstance(k, str) + assert isinstance(v, str) self._attributes[k] = v def __delitem__(self, k): - assert isinstance(k, unicode) + assert isinstance(k, str) del self._attributes[k] def merge(self, *others): @@ -148,7 +143,7 @@ class Attributes(object): self._attributes.update(other._attributes) class Graph(Attributes): - __slots__ = (u'default_vertex', u'default_edge', u'_vertices', u'_edges', u'_vertex_lookup') + __slots__ = ('default_vertex', 'default_edge', '_vertices', '_edges', '_vertex_lookup') def __init__(self): Attributes.__init__(self) @@ -159,7 +154,7 @@ class Graph(Attributes): self._vertex_lookup = {} def vertex(self, name, insert=True): - assert isinstance(name, unicode) + assert isinstance(name, str) vert = self._vertex_lookup.get(name) if insert and vert is None: vert = Vertex(name) @@ -236,21 +231,21 @@ class Graph(Attributes): def p(*args): for x in args: - out.write(unicode(x)) - out.write(u'\n') - p(u'digraph') - p(u'{') + out.write(str(x)) + out.write('\n') + p('digraph') + p('{') for ak, av in sorted(self._attributes.items()): - p(u' ', ak, u'=', gvq(av), u';') + p(' ', ak, '=', gvq(av), ';') for ak, av in sorted(self.default_vertex._attributes.items()): - p(u' node [', ak, u'=', gvq(av), u'];') + p(' node [', ak, '=', gvq(av), '];') for ak, av in sorted(self.default_edge._attributes.items()): - p(u' edge [', ak, u'=', gvq(av), u'];') + p(' edge [', ak, '=', gvq(av), '];') for n in sorted(self._vertices): - p(u' ', n) + p(' ', n) for _, e in sorted(self._edges.items()): - p(u' ', e) - p(u'}') + p(' ', e) + p('}') def dot_str(self): from io import StringIO @@ -259,18 +254,18 @@ class Graph(Attributes): return out.getvalue() def dot_file(self, name): - with open(name, u'w') as f: + with open(name, 'w') as f: self.dot(f, False) def preview(self, block): from subprocess import Popen, PIPE - proc = Popen([u'dot', u'-Txlib', u'/dev/stdin'], stdin=PIPE, universal_newlines=True) + proc = Popen(['dot', '-Txlib', '/dev/stdin'], stdin=PIPE, universal_newlines=True) self.dot(proc.stdin, True) if block: proc.wait() class Vertex(Attributes): - __slots__ = (u'_key', u'_post', u'_pre', u'__weakref__') + __slots__ = ('_key', '_post', '_pre', '__weakref__') def __init__(self, key): Attributes.__init__(self) @@ -279,13 +274,13 @@ class Vertex(Attributes): self._pre = set() def __str__(self): - return u'%s%s;' % (gvq(self._key), gva(self._attributes)) + return '%s%s;' % (gvq(self._key), gva(self._attributes)) def __lt__(self, other): return self._key < other._key class Edge(Attributes): - __slots__ = (u'_from', u'_to') + __slots__ = ('_from', '_to') def __init__(self, f, t): Attributes.__init__(self) @@ -293,7 +288,7 @@ class Edge(Attributes): self._to = t def __str__(self): - return u'%s -> %s%s;' % (gvq(self._from._key), gvq(self._to._key), gva(self._attributes)) + return '%s -> %s%s;' % (gvq(self._from._key), gvq(self._to._key), gva(self._attributes)) # TOC_TYPES @@ -7177,16 +7172,16 @@ def make_dots(ctx): covered_nodes = sorted(p.pre_set(d, 2) | p.post_set(d, 2)) covered_edges = [(a, b) for a in covered_nodes for b in covered_nodes if b in d[a].post] g = Graph() - g.default_vertex[u'shape'] = u'box' - # g[u'layout'] = u'twopi' - # g[u'root'] = u'0x%04x' % id + g.default_vertex['shape'] = 'box' + # g['layout'] = 'twopi' + # g['root'] = '0x%04x' % id for n in covered_nodes: - v = g.vertex(u'0x%04x' % n) - v[u'label'] = u'Packet \\N: %s' % d[n].name + v = g.vertex('0x%04x' % n) + v['label'] = 'Packet \\N: %s' % d[n].name if n == id: - v[u'style'] = u'filled' + v['style'] = 'filled' for (a, b) in covered_edges: - g.edge(u'0x%04x' % a, u'0x%04x' % b) + g.edge('0x%04x' % a, '0x%04x' % b) for n in covered_nodes: # the center node will be covered specially below if n == id: @@ -7204,10 +7199,10 @@ def make_dots(ctx): # don't show mere siblings unless also ancestor/descendent count += 1 if count: - v = g.vertex(u'0x%04x...pre' % n) - v[u'label'] = u'%d more' % count - v[u'style'] = u'dashed' - g.edge(v, u'0x%04x' % n) + v = g.vertex('0x%04x...pre' % n) + v['label'] = '%d more' % count + v['style'] = 'dashed' + g.edge(v, '0x%04x' % n) # strong forward links count = 0 for p in d[n].post: @@ -7216,36 +7211,36 @@ def make_dots(ctx): elif p not in covered_nodes: count += 1 if count: - v = g.vertex(u'0x%04x...post' % n) - v[u'label'] = u'%d more' % count - v[u'style'] = u'dashed' - g.edge(u'0x%04x' % n, v) + v = g.vertex('0x%04x...post' % n) + v['label'] = '%d more' % count + v['style'] = 'dashed' + g.edge('0x%04x' % n, v) # for the immediate node, also cover specials and weaks for p in d[id].pre: # (there are no weak backward specials) # strong backward specials if isinstance(p, SpecialEventOrigin): - g.edge(unicode(p.name), u'0x%04x' % id) + g.edge(str(p.name), '0x%04x' % id) # weak backward nodes elif id in d[p].xpost: - e = g.edge(u'0x%04x' % p, u'0x%04x' % id) - e[u'style']=u'dashed' - e[u'weight'] = u'0' + e = g.edge('0x%04x' % p, '0x%04x' % id) + e['style']='dashed' + e['weight'] = '0' for p in d[id].post: # strong forward specials if isinstance(p, SpecialEventOrigin): - g.edge(u'0x%04x' % id, unicode(p.name)) + g.edge('0x%04x' % id, str(p.name)) for p in d[id].xpost: # weak forward specials if isinstance(p, SpecialEventOrigin): - e = g.edge(u'0x%04x' % id, unicode(p.name)) - e[u'style'] = u'dashed' - e[u'weight'] = u'0' + e = g.edge('0x%04x' % id, str(p.name)) + e['style'] = 'dashed' + e['weight'] = '0' # weak forward nodes elif p not in covered_nodes: - e = g.edge(u'0x%04x' % id, u'0x%04x' % p) - e[u'style'] = u'dashed' - e[u'weight'] = u'0' + e = g.edge('0x%04x' % id, '0x%04x' % p) + e['style'] = 'dashed' + e['weight'] = '0' g.dot(f, False) -- cgit v1.2.3-70-g09d2 From 9903d45c343fe51309075674c96b4411b6e1a002 Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Wed, 5 Jun 2024 20:09:57 +0000 Subject: python3: Add explicit list()s for python3.6 This should be reverted once we drop support for Ubuntu 18.04, and therefore python3.6, as it does clutter up the code a bit. Sourced from specing's work on the porting process. See https://git.themanaworld.org/legacy/tmwa/-/merge_requests/256 --- src/main-gdb-head.py | 2 +- src/map/script-parse.py | 2 +- tools/config.py | 6 +++--- tools/protocol.py | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tools') diff --git a/src/main-gdb-head.py b/src/main-gdb-head.py index a465c97..09e22fe 100644 --- a/src/main-gdb-head.py +++ b/src/main-gdb-head.py @@ -5,7 +5,7 @@ # gdb sticks everything in one scope. # This lets us enumerate what *we* added. -initial_globals = {id(v):v for v in globals().values()} +initial_globals = {id(v):v for v in list(globals().values())} import re diff --git a/src/map/script-parse.py b/src/map/script-parse.py index 199e348..3346b92 100644 --- a/src/map/script-parse.py +++ b/src/map/script-parse.py @@ -106,7 +106,7 @@ class ScriptBuffer(object): code_begin = code['_M_impl']['_M_start'] code_end = code['_M_impl']['_M_finish'] code_size = int(code_end - code_begin) - r = iter(range(code_size)) + r = iter(list(range(code_size))) for i in r: buf = [] for label in labels_dict.get(i, []): diff --git a/tools/config.py b/tools/config.py index ce61440..22ece0b 100755 --- a/tools/config.py +++ b/tools/config.py @@ -257,7 +257,7 @@ class Group(object): short_cpp_name = '%s.cpp' % var_name cpp_name = os.path.join(path, short_cpp_name) - values = sorted(self.options.values(), key=lambda o: o.name) + values = sorted(list(self.options.values()), key=lambda o: o.name) desc = 'Config for %s::%s' % (namespace_name, self.name) with OpenWrite(hpp_name) as hpp, \ @@ -382,7 +382,7 @@ class Realm(object): return rv def dump(self): - for g in self.groups.values(): + for g in list(self.groups.values()): g.dump_in(self.path, self.path.split('/')[-1]) class Everything(object): @@ -399,7 +399,7 @@ class Everything(object): def dump(self): for g in glob.glob('src/*/*_conf.[ch]pp'): os.rename(g, g + '.old') - for v in self.realms.values(): + for v in list(self.realms.values()): v.dump() for g in glob.glob('src/*/*_conf.[ch]pp.old'): print('Obsolete: %s' % g) diff --git a/tools/protocol.py b/tools/protocol.py index 8059c59..b0d46a4 100755 --- a/tools/protocol.py +++ b/tools/protocol.py @@ -7084,7 +7084,7 @@ def partition(d): changed = True while changed: changed = False - for k, vlist in d.items(): + for k, vlist in list(d.items()): if vlist: m = min(leaders[v] for v in vlist) if m < leaders[k]: @@ -7100,9 +7100,9 @@ def partition(d): leaders[v] = m followers = {} - for k, v in leaders.items(): + for k, v in list(leaders.items()): followers.setdefault(v, []).append(k) - return [set(v) for v in followers.values()] + return [set(v) for v in list(followers.values())] def ids_only(vpost): rv = [e for e in vpost if not isinstance(e, SpecialEventOrigin)] @@ -7125,7 +7125,7 @@ def make_dots(ctx): for g in glob.glob('doc-gen/Packet-*.md'): os.rename(g, g + '.old') - for (id, p) in d.items(): + for (id, p) in list(d.items()): md = 'doc-gen/Packet-0x%04x.md' % id dot = 'doc-gen/packets-around-0x%04x.gv' % id with OpenWrite(md) as f: -- cgit v1.2.3-70-g09d2 From c33d3f8efc280a2c4e3e440d065360094151c331 Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Wed, 5 Jun 2024 20:29:36 +0000 Subject: python3: Add explicit encoding='utf-8' for python3.6 --- tools/protocol.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/protocol.py b/tools/protocol.py index b0d46a4..c4c8657 100755 --- a/tools/protocol.py +++ b/tools/protocol.py @@ -84,7 +84,7 @@ class OpenWrite(object): self.filename = filename def __enter__(self): - self.handle = open(self.filename + '.tmp', 'w') + self.handle = open(self.filename + '.tmp', 'w', encoding='utf-8') return self.handle def __exit__(self, ty, v, tb): -- cgit v1.2.3-70-g09d2 From f928d23f106f19ab9f2ccd5d57a5728f66ccb17f Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Wed, 5 Jun 2024 23:43:58 +0000 Subject: debug-debug: Update deprecated gdb syntax --- tools/debug-debug.gdb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/debug-debug.gdb b/tools/debug-debug.gdb index b50a49b..5bf3a57 100644 --- a/tools/debug-debug.gdb +++ b/tools/debug-debug.gdb @@ -9,7 +9,7 @@ gdb.execute('file %s' % file_to_load) end set logging file /dev/null set logging redirect on -set logging off +set logging enabled off python import re @@ -41,7 +41,7 @@ set print elements 9999 set print frame-arguments none set python print-stack full -set logging on +set logging enabled on # Workaround "Function... not defined in.." (breakpoints not found) (GDB bug) # https://sourceware.org/bugzilla/show_bug.cgi?id=15962 # In some gdb versions rbreak works, in some break does. @@ -55,7 +55,7 @@ if bpoint.pending: gdb.execute("rbreak do_breakpoint") end -set logging off +set logging enabled off commands silent -- cgit v1.2.3-70-g09d2 From 88dfbd91ed22ab4ad98b2b9f0243f9d9faa9b49d Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Wed, 26 Feb 2025 10:01:29 +0100 Subject: tools/protocol.py: Avoid usage of deprecated pipes.quote The deprecated `pipes.quote` was removed in Python 3.13. Fortunately, the same functionality has been available as `shlex.quote` since Python 3.3. --- tools/protocol.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/protocol.py b/tools/protocol.py index c4c8657..d278884 100755 --- a/tools/protocol.py +++ b/tools/protocol.py @@ -21,9 +21,8 @@ # along with this program. If not, see . import glob -import itertools import os -from pipes import quote +from shlex import quote from posixpath import relpath from weakref import ref as wr -- cgit v1.2.3-70-g09d2