Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/open-method-typeerror-win' into 'dev'

Browse Source 
Fix duplicate encoding argument on windows migration read

See merge request crafty-controller/crafty-commander!149
This commit is contained in:
Iain Powrie 2022-01-26 02:47:06 +00:00
commit d884cac5d7
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/classes/shared/migration.py
View File

@ -392,17 +392,15 @@ class MigrationManager():
"""
Reads a migration from a file.
"""
call_params = {}
if helper.is_os_windows() and sys.version_info >= (3, 0):
# if system is windows - force utf-8 encoding
call_params['encoding'] = 'utf-8'
with open(os.path.join(helper.migration_dir, name + '.py'), **call_params, encoding='utf-8') as f:
code = f.read()
scope = {}
code = compile(code, '<string>', 'exec', dont_inherit=True)
# pylint: disable=exec-used
exec(code, scope, None)
return scope.get('migrate', lambda m, d: None), scope.get('rollback', lambda m, d: None)
with open(os.path.join(helper.migration_dir, name + '.py'), encoding='utf-8') as f:
code = f.read()
scope = {}
code = compile(code, '<string>', 'exec', dont_inherit=True)
# pylint: disable=exec-used
exec(code, scope, None)
return scope.get('migrate', lambda m, d: None), scope.get('rollback', lambda m, d: None)
def up_one(self, name: str, migrator: Migrator,
fake: bool = False, rollback: bool = False) -> str: