--- a/hgext/convert/cvs.py	Mon Sep 24 22:46:22 2018 -0400
+++ b/hgext/convert/cvs.py	Fri Sep 21 19:48:23 2018 -0400
@@ -15,7 +15,6 @@
 from mercurial import (
     encoding,
     error,
-    pycompat,
     util,
 )
 from mercurial.utils import (
@@ -74,7 +73,7 @@
                 raise error.Abort(_('revision %s is not a patchset number')
                                  % self.revs[0])
 
-        d = pycompat.getcwd()
+        d = encoding.getcwd()
         try:
             os.chdir(self.path)
             id = None