This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager.
commit f3b9392a0bac1426685db93ac8179f8891e4a3af Author: Simon McVittie <[email protected]> Date: Thu Mar 12 23:49:15 2015 +0000 Rename yaml_data to just data, and load_yaml_games to load_games --- game_data_packager/__init__.py | 42 +++++++++++++-------------- game_data_packager/check_syntax.py | 4 +-- game_data_packager/games/doom_common.py | 6 ++-- game_data_packager/games/residualvm_common.py | 6 ++-- game_data_packager/games/scummvm_common.py | 6 ++-- game_data_packager/stats.py | 7 ++--- 6 files changed, 34 insertions(+), 37 deletions(-) diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py index 042d4a7..9372c53 100644 --- a/game_data_packager/__init__.py +++ b/game_data_packager/__init__.py @@ -439,7 +439,7 @@ class GameDataPackage(object): class GameData(object): def __init__(self, shortname, - yaml_data, + data, workdir=None): # The name of the game for command-line purposes, e.g. quake3 self.shortname = shortname @@ -487,20 +487,20 @@ class GameData(object): # Steam ID and path self.steam = {} - self.yaml = yaml_data + self.data = data self.argument_parser = None for k in ('longname', 'copyright', 'compress_deb', 'help_text', 'steam','engine', 'genre'): - if k in self.yaml: - setattr(self, k, self.yaml[k]) + if k in self.data: + setattr(self, k, self.data[k]) - if 'aliases' in self.yaml: - self.aliases = set(self.yaml['aliases']) + if 'aliases' in self.data: + self.aliases = set(self.data['aliases']) - if 'try_repack_from' in self.yaml: - paths = self.yaml['try_repack_from'] + if 'try_repack_from' in self.data: + paths = self.data['try_repack_from'] if isinstance(paths, list): self.try_repack_from = paths elif isinstance(paths, str): @@ -509,10 +509,10 @@ class GameData(object): raise AssertionError('try_repack_from should be str or list') # these should be per-package - assert 'install_files' not in self.yaml - assert 'package' not in self.yaml - assert 'symlinks' not in self.yaml - assert 'install_files_from_cksums' not in self.yaml + assert 'install_files' not in self.data + assert 'package' not in self.data + assert 'symlinks' not in self.data + assert 'install_files_from_cksums' not in self.data # Map from WantedFile name to instance. # { 'baseq3/pak1.pk3': WantedFile instance } @@ -574,11 +574,11 @@ class GameData(object): # Debian architecture self._architecture = None - self._populate_files(self.yaml.get('files')) + self._populate_files(self.data.get('files')) - assert 'packages' in self.yaml + assert 'packages' in self.data - for binary, data in self.yaml['packages'].items(): + for binary, data in self.data['packages'].items(): # these should only be at top level, since they are global assert 'cksums' not in data, binary assert 'md5sums' not in data, binary @@ -591,8 +591,8 @@ class GameData(object): self.packages[binary] = package self._populate_package(package, data) - if 'cksums' in self.yaml: - for line in self.yaml['cksums'].splitlines(): + if 'cksums' in self.data: + for line in self.data['cksums'].splitlines(): stripped = line.strip() if stripped == '' or stripped.startswith('#'): continue @@ -602,8 +602,8 @@ class GameData(object): f.size = int(size) for alg in ('md5', 'sha1', 'sha256'): - if alg + 'sums' in self.yaml: - for line in self.yaml[alg + 'sums'].splitlines(): + if alg + 'sums' in self.data: + for line in self.data[alg + 'sums'].splitlines(): stripped = line.strip() if stripped == '' or stripped.startswith('#'): continue @@ -2390,7 +2390,7 @@ class GameData(object): 'apt-get install %s', ' '.join(sorted(packages))) -def load_yaml_games(workdir=None): +def load_games(workdir=None): games = {} for yamlfile in glob.glob(os.path.join(DATADIR, '*.yaml')): @@ -2474,7 +2474,7 @@ def run_command_line(): game_parsers = parser.add_subparsers(dest='shortname', title='supported games', metavar='GAME') - games = load_yaml_games(None) + games = load_games(None) for g in sorted(games.keys()): games[g].add_parser(game_parsers, base_parser) diff --git a/game_data_packager/check_syntax.py b/game_data_packager/check_syntax.py index e28a707..7745da2 100644 --- a/game_data_packager/check_syntax.py +++ b/game_data_packager/check_syntax.py @@ -18,10 +18,10 @@ import os import yaml -from . import load_yaml_games +from . import load_games if __name__ == '__main__': - for name, game in load_yaml_games().items(): + for name, game in load_games().items(): if 'DEBUG' in os.environ: print('# %s -----------------------------------------' % name) print(yaml.safe_dump(game.to_yaml())) diff --git a/game_data_packager/games/doom_common.py b/game_data_packager/games/doom_common.py index 1b16321..77dfd34 100644 --- a/game_data_packager/games/doom_common.py +++ b/game_data_packager/games/doom_common.py @@ -71,8 +71,8 @@ class DoomGameData(GameData): Darkplaces). """ - def __init__(self, shortname, yaml_data, workdir=None): - super(DoomGameData, self).__init__(shortname, yaml_data, + def __init__(self, shortname, data, workdir=None): + super(DoomGameData, self).__init__(shortname, data, workdir=workdir) if self.engine is None: self.engine = "chocolate-doom | doom-engine" @@ -91,7 +91,7 @@ class DoomGameData(GameData): engine = package.engine or self.engine engine = engine.split('|')[-1].strip() package.program = package_map.get(engine, engine) - package.create_desktop_file = self.yaml['packages'][package.name].get( + package.create_desktop_file = self.data['packages'][package.name].get( 'create_desktop_file', True) def construct_package(self, binary): diff --git a/game_data_packager/games/residualvm_common.py b/game_data_packager/games/residualvm_common.py index 771c745..9988ab0 100644 --- a/game_data_packager/games/residualvm_common.py +++ b/game_data_packager/games/residualvm_common.py @@ -26,11 +26,11 @@ from ..util import (TemporaryUmask, copy_with_substitutions, mkdir_p) logger = logging.getLogger('game-data-packager.games.residualvm-common') class ResidualvmGameData(GameData): - def __init__(self, shortname, yaml_data, workdir=None): - super(ResidualvmGameData, self).__init__(shortname, yaml_data, + def __init__(self, shortname, data, workdir=None): + super(ResidualvmGameData, self).__init__(shortname, data, workdir=workdir) - self.gameid = self.yaml['gameid'] + self.gameid = self.data['gameid'] if self.engine is None: self.engine = 'residualvm' diff --git a/game_data_packager/games/scummvm_common.py b/game_data_packager/games/scummvm_common.py index 75cd887..229be3a 100644 --- a/game_data_packager/games/scummvm_common.py +++ b/game_data_packager/games/scummvm_common.py @@ -26,11 +26,11 @@ from ..util import (TemporaryUmask, copy_with_substitutions, mkdir_p) logger = logging.getLogger('game-data-packager.games.scummvm-common') class ScummvmGameData(GameData): - def __init__(self, shortname, yaml_data, workdir=None): - super(ScummvmGameData, self).__init__(shortname, yaml_data, + def __init__(self, shortname, data, workdir=None): + super(ScummvmGameData, self).__init__(shortname, data, workdir=workdir) - self.gameid = self.yaml['gameid'] + self.gameid = self.data['gameid'] if self.engine is None: self.engine = 'scummvm' diff --git a/game_data_packager/stats.py b/game_data_packager/stats.py index aa5eab6..484e001 100644 --- a/game_data_packager/stats.py +++ b/game_data_packager/stats.py @@ -15,13 +15,10 @@ # You can find the GPL license text on a Debian system under # /usr/share/common-licenses/GPL-2. -import os -import yaml - -from . import load_yaml_games +from . import load_games games = [] -for name, game in load_yaml_games().items(): +for name, game in load_games().items(): game_struct = { 'genre': game.genre or 'Unknown', 'shortname': name, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
