Make atomic_write work on paths with no directory separator (untitaker#20)

DarwinAwardWinner · untitaker · commit e6d1576f6f8b · 2016-08-14T14:27:54.000+02:00
Fixes untitaker#19.
diff --git a/atomicwrites/__init__.py b/atomicwrites/__init__.py
@@ -43,14 +43,14 @@ def _sync_directory(directory):
 
     def _replace_atomic(src, dst):
         os.rename(src, dst)
-        _sync_directory(os.path.dirname(dst))
+        _sync_directory(os.path.normpath(os.path.dirname(dst)))
 
     def _move_atomic(src, dst):
         os.link(src, dst)
         os.unlink(src)
 
-        src_dir = os.path.dirname(src)
-        dst_dir = os.path.dirname(dst)
+        src_dir = os.path.normpath(os.path.dirname(src))
+        dst_dir = os.path.normpath(os.path.dirname(dst))
         _sync_directory(dst_dir)
         if src_dir != dst_dir:
             _sync_directory(src_dir)
@@ -161,7 +161,7 @@ def _open(self, get_fileobject):
     def get_fileobject(self, dir=None, **kwargs):
         '''Return the temporary file to use.'''
         if dir is None:
-            dir = os.path.dirname(self._path)
+            dir = os.path.normpath(os.path.dirname(self._path))
         return tempfile.NamedTemporaryFile(mode=self._mode, dir=dir,
                                            delete=False, **kwargs)
 
diff --git a/tests/test_atomicwrites.py b/tests/test_atomicwrites.py
@@ -1,4 +1,5 @@
 import errno
+import os
 
 from atomicwrites import atomic_write
 
@@ -65,3 +66,24 @@ def test_open_reraise(tmpdir):
             f.name = "asdf"
             # Now trigger our own exception.
             assert False, "Intentional failure for testing purposes"
+
+
+def test_atomic_write_in_pwd(tmpdir):
+    orig_curdir = os.getcwd()
+    try:
+        os.chdir(str(tmpdir))
+        fname = 'ha'
+        for i in range(2):
+            with atomic_write(str(fname), overwrite=True) as f:
+                f.write('hoho')
+
+        with pytest.raises(OSError) as excinfo:
+            with atomic_write(str(fname), overwrite=False) as f:
+                f.write('haha')
+
+        assert excinfo.value.errno == errno.EEXIST
+
+        assert open(fname).read() == 'hoho'
+        assert len(tmpdir.listdir()) == 1
+    finally:
+        os.chdir(orig_curdir)
