anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

remove "import imp/import importlib hybridation" (#381)

Browse source
This commit is contained in:
Alexandre Detiste 2024-09-18 04:42:51 +02:00 • committed by GitHub
parent d7c145ac18
commit 83baa54164
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pysollib/gamedb.py
View file

@ -21,22 +21,13 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
from importlib import util
import pysollib.settings import pysollib.settings
from pysollib.mfxutil import Struct, print_err from pysollib.mfxutil import Struct, print_err
from pysollib.mygettext import _, n_ from pysollib.mygettext import _, n_
from pysollib.resource import CSI from pysollib.resource import CSI
import six
# Handle import of import library - different libraries are needed
# for different Python versions.
imp = None
util = None
try:
from importlib import util
except ImportError:
util = None
import imp
# ************************************************************************ # ************************************************************************
# * constants # * constants
@ -661,13 +652,13 @@ class GameInfo(Struct):
): ):
# #
def to_unicode(s): def to_unicode(s):
if isinstance(s, six.text_type): if isinstance(s, str):
return s return s
try: try:
s = six.text_type(s, 'utf-8') s = str(s, 'utf-8')
except UnicodeDecodeError as err: except UnicodeDecodeError as err:
print_err(err) print_err(err)
s = six.text_type(s, 'utf-8', 'ignore') s = str(s, 'utf-8', 'ignore')
return s return s
ncards = decks * (len(suits) * len(ranks) + len(trumps)) ncards = decks * (len(suits) * len(ranks) + len(trumps))
game_flags = game_type & ~1023 game_flags = game_type & ~1023
@ -682,7 +673,7 @@ class GameInfo(Struct):
short_name = to_unicode(short_name) short_name = to_unicode(short_name)
if pysollib.settings.TRANSLATE_GAME_NAMES: if pysollib.settings.TRANSLATE_GAME_NAMES:
short_name = _(short_name) short_name = _(short_name)
if isinstance(altnames, six.string_types): if isinstance(altnames, str):
altnames = (altnames,) altnames = (altnames,)
altnames = [to_unicode(n) for n in altnames] altnames = [to_unicode(n) for n in altnames]
if pysollib.settings.TRANSLATE_GAME_NAMES: if pysollib.settings.TRANSLATE_GAME_NAMES:
@ -918,12 +909,9 @@ def loadGame(modname, filename, check_game=False):
# print "load game", modname, filename # print "load game", modname, filename
GAME_DB.check_game = check_game GAME_DB.check_game = check_game
GAME_DB.current_filename = filename GAME_DB.current_filename = filename
if util is not None: spec = util.spec_from_file_location(modname, filename)
spec = util.spec_from_file_location(modname, filename) module = util.module_from_spec(spec)
module = util.module_from_spec(spec) spec.loader.exec_module(module)
spec.loader.exec_module(module)
else:
imp.load_source(modname, filename)
# execfile(filename, globals(), globals()) # execfile(filename, globals(), globals())
GAME_DB.current_filename = None GAME_DB.current_filename = None