diff options
| author | Diego Prado Gesto <d.pradogesto@ultimaker.com> | 2018-06-13 12:53:02 +0300 |
|---|---|---|
| committer | Diego Prado Gesto <d.pradogesto@ultimaker.com> | 2018-06-13 12:53:02 +0300 |
| commit | 554a3fd9088dee488d9173aa50c98d8c66f5ad0c (patch) | |
| tree | 7a7fd2f2153843fe16df0133ca3c01292255af4b /tests | |
| parent | f1b0c6238f302b86b87d18a8eb1131dd9d9bef53 (diff) | |
| parent | 3a00ddb01d224ae8ee2545f4e69ff00bbfd7b5fb (diff) | |
Merge branch 'master' into mypy_fixes
Conflicts:
cura/Backups/Backup.py
cura/Settings/ExtruderManager.py
cura/Settings/MachineManager.py
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/TestProfileRequirements.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/TestProfileRequirements.py b/tests/TestProfileRequirements.py index edeec909f2..f75ca9da8d 100644 --- a/tests/TestProfileRequirements.py +++ b/tests/TestProfileRequirements.py @@ -19,7 +19,7 @@ import pytest def test_ultimaker3extended_variants(um3_file, um3e_file): directory = os.path.join(os.path.dirname(__file__), "..", "resources", "variants") #TODO: Hardcoded path relative to this test file. um3 = configparser.ConfigParser() - um3.read_file(open(os.path.join(directory, um3_file))) + um3.read_file(open(os.path.join(directory, um3_file), encoding = "utf-8")) um3e = configparser.ConfigParser() - um3e.read_file(open(os.path.join(directory, um3e_file))) + um3e.read_file(open(os.path.join(directory, um3e_file), encoding = "utf-8")) assert um3["values"] == um3e["values"] |