Normalize paths and replace instead of rename to make atomic files work in Windows. (hedyorg#3497)

Paths are now normalized by os. Some forward/backward slashes sometimes cause errors in finding files on windows. 
os.rename in utils changed to os.replace to make sure it works on Windows aswell (atomic when succesfull)

Author: Mark-Giesen

tests/Highlighter.py

@@ -207,10 +207,11 @@ def get_state_machine(self, level, lang="en"):
 
         Returns a state machine.
         """
-        root_dir = os.path.dirname(__file__) +"/.."
+        root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
+        trad_file = os.path.normpath(root_dir+'/highlighting/highlighting-trad.json')
 
         # get traduction
-        with open(f'{root_dir}/highlighting/highlighting-trad.json') as file_regex_trad:
+        with open(trad_file, 'r', encoding='utf-8') as file_regex_trad:
             data_regex_trad = json.load(file_regex_trad)
 
         if lang not in data_regex_trad.keys():
@@ -219,7 +220,8 @@ def get_state_machine(self, level, lang="en"):
         regex_trad = data_regex_trad[lang]
 
         # get state_machine
-        with open(f'{root_dir}/highlighting/highlighting.json') as file_regex:
+        sm_file = os.path.normpath(root_dir+'/highlighting/highlighting.json')
+        with open(sm_file, 'r', encoding='utf-8') as file_regex:
             data_regex = json.load(file_regex)
 
         # apply translation of keywords

tests/tests_z_yamlfile.py

@@ -12,11 +12,11 @@ def test_load_yaml_equivalent(self):
     although we're not going to fail the test on the numbers we get from that.
     """
     n = 50
-
+ 
     # Pick a file with unicode in it so we're sure it gets handled properly
-    file = YamlFile(
-      os.path.join(os.path.dirname(__file__), '..', 'content/adventures/hu.yaml'), 
-      try_pickle=True)
+    root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
+    yaml_file = os.path.normpath(root_dir+'/content/adventures/hu.yaml')
+    file = YamlFile(yaml_file, try_pickle=True)
 
     # Remove pickled version of this file if it exists, it may
     # influence the tests
@@ -37,4 +37,4 @@ def test_load_yaml_equivalent(self):
     cached_seconds = time.time() - start
 
     self.assertEqual(original_data, cached_data)
-    print(f'YAML loading takes {original_seconds / n} seconds, unpickling takes {cached_seconds / n} ({original_seconds / cached_seconds:.1f}x faster)')
+    print(f'YAML loading takes {original_seconds / n} seconds, unpickling takes {cached_seconds / n} ({original_seconds / cached_seconds:.1f}x faster)')

utils.py

@@ -227,23 +227,19 @@ def atomic_write_file(filename, mode='wb'):
     """Write to a filename atomically.
 
     First write to a unique tempfile, then rename the tempfile into
-    place. Use as a context manager:
+    place. Use replace instead of rename to make it atomic on windows as well. 
+    Use as a context manager:
 
         with atomic_write_file('file.txt') as f:
             f.write('hello')
-
-    THIS WON'T WORK ON WINDOWS -- atomic file renames don't overwrite
-    on Windows. We now just swallow the exception, someone else already wrote the file?)
     """
 
     tmp_file = f'{filename}.{os.getpid()}'
     with open(tmp_file, mode) as f:
         yield f
+    
+    os.replace(tmp_file, filename)
 
-    try:
-        os.rename(tmp_file, filename)
-    except IOError:
-        pass
 
 # This function takes a date in milliseconds from the Unix epoch and transforms it into a printable date
 # It operates by converting the date to a string, removing its last 3 digits, converting it back to an int