diff options
author | Michel Zou | 2019-01-10 20:41:34 +0100 |
---|---|---|
committer | Michel Zou | 2019-01-10 20:41:34 +0100 |
commit | efea789456dbf872d774183ead710611244149fc (patch) | |
tree | 0c4853a603af80e599f463f84145b1cc83990165 /unzip_dir_encoding_fix.patch | |
parent | 4e8228bcc2e15a81f87e868fa6c5de6c7a6cd26f (diff) | |
download | aur-efea789456dbf872d774183ead710611244149fc.tar.gz |
fix
Diffstat (limited to 'unzip_dir_encoding_fix.patch')
-rw-r--r-- | unzip_dir_encoding_fix.patch | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/unzip_dir_encoding_fix.patch b/unzip_dir_encoding_fix.patch index 3d4af56587f6..4f7ddc24f7ff 100644 --- a/unzip_dir_encoding_fix.patch +++ b/unzip_dir_encoding_fix.patch @@ -1,36 +1,22 @@ diff --git a/src/pyfmi/fmi.pyx b/src/pyfmi/fmi.pyx -index d30de5f..5449808 100644 +index d30de5f..8ca80e4 100644 --- a/src/pyfmi/fmi.pyx +++ b/src/pyfmi/fmi.pyx -@@ -7894,9 +7894,9 @@ def load_fmu(fmu, path = '.', enable_logging = None, log_file_name = "", kind = +@@ -1164,7 +1164,7 @@ cdef class FMUModelBase(ModelBase): - #Compare fmu_kind with input-specified kind - if fmu_1_kind == FMI_ME and kind.upper() != 'CS': -- model=FMUModelME1(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir) -+ model=FMUModelME1(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir)) - elif (fmu_1_kind == FMI_CS_STANDALONE or fmu_1_kind == FMI_CS_TOOL) and kind.upper() != 'ME': -- model=FMUModelCS1(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir) -+ model=FMUModelCS1(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir)) + fmu_full_path = os.path.abspath(os.path.join(path,fmu)) + if _unzipped_dir: +- fmu_temp_dir = encode(_unzipped_dir) ++ fmu_temp_dir = _unzipped_dir else: - FMIL.fmi1_import_free(fmu_1) - FMIL.fmi_import_free_context(context) -@@ -7938,15 +7938,15 @@ def load_fmu(fmu, path = '.', enable_logging = None, log_file_name = "", kind = - #FMU kind is known - if kind.lower() == 'auto': - if fmu_2_kind == FMIL.fmi2_fmu_kind_cs: -- model = FMUModelCS2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir) -+ model = FMUModelCS2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir)) - elif fmu_2_kind == FMIL.fmi2_fmu_kind_me or fmu_2_kind == FMIL.fmi2_fmu_kind_me_and_cs: -- model = FMUModelME2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir) -+ model = FMUModelME2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir)) - elif kind.upper() == 'CS': - if fmu_2_kind == FMIL.fmi2_fmu_kind_cs or fmu_2_kind == FMIL.fmi2_fmu_kind_me_and_cs: -- model = FMUModelCS2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir) -+ model = FMUModelCS2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir)) - elif kind.upper() == 'ME': - if fmu_2_kind == FMIL.fmi2_fmu_kind_me or fmu_2_kind == FMIL.fmi2_fmu_kind_me_and_cs: -- model = FMUModelME2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=fmu_temp_dir) -+ model = FMUModelME2(fmu, path, original_enable_logging, log_file_name,log_level, _unzipped_dir=decode(fmu_temp_dir)) + fmu_temp_dir = encode(create_temp_dir()) + self._fmu_temp_dir = <char*>FMIL.malloc((FMIL.strlen(fmu_temp_dir)+1)*sizeof(char)) +@@ -3758,7 +3758,7 @@ cdef class FMUModelBase2(ModelBase): - #Could not match FMU kind with input-specified kind - if model is None: + #Get the FMI version of the provided model + if _unzipped_dir: +- fmu_temp_dir = encode(_unzipped_dir) ++ fmu_temp_dir = _unzipped_dir + else: + fmu_temp_dir = encode(create_temp_dir()) + self._fmu_temp_dir = <char*>FMIL.malloc((FMIL.strlen(fmu_temp_dir)+1)*sizeof(char)) |