Fix imports

conda · Dec 8, 2023 · 95bd9d2 · 95bd9d2
1 parent 34edd8b
commit 95bd9d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/menuinst/_legacy/cwp.py b/menuinst/_legacy/cwp.py
@@ -7,7 +7,8 @@
 import sys
 from os.path import join, pathsep
 
-from menuinst._legacy.knownfolders import FOLDERID, get_folder_path
+# this must be an absolute import since the cwp.py script is copied to $PREFIX
+from menuinst.knownfolders import FOLDERID, get_folder_path
 
 # call as: python cwp.py [--no-console] PREFIX ARGs...
 parser = argparse.ArgumentParser()

diff --git a/menuinst/_legacy/main.py b/menuinst/_legacy/main.py
@@ -1,8 +1,7 @@
 import sys
 from os.path import join
 
-import menuinst._legacy as menuinst
-
+from .. import __version__, install
 from ..utils import DEFAULT_PREFIX
 
 
@@ -20,11 +19,11 @@ def main():
     opts, args = p.parse_args()
 
     if opts.version:
-        sys.stdout.write("menuinst: %s\n" % menuinst.__version__)
+        sys.stdout.write("menuinst: %s\n" % __version__)
         return
 
     for arg in args:
-        menuinst.install(join(opts.prefix, arg), opts.remove, opts.prefix)
+        install(join(opts.prefix, arg), opts.remove, opts.prefix)
 
 
 if __name__ == '__main__':