diff -r a8b17859684a -r 20a42325fdef hgext/convert/cvs.py
--- a/hgext/convert/cvs.py	Wed Aug 17 20:57:15 2016 -0700
+++ b/hgext/convert/cvs.py	Wed Nov 23 00:03:11 2016 +0530
@@ -15,6 +15,7 @@
 from mercurial import (
     encoding,
     error,
+    pycompat,
     util,
 )
 
@@ -69,7 +70,7 @@
                 raise error.Abort(_('revision %s is not a patchset number')
                                  % self.revs[0])
 
-        d = os.getcwd()
+        d = pycompat.getcwd()
         try:
             os.chdir(self.path)
             id = None