Clean up imports

Author: klamike

pysrc/juliacall/__main__.py

@@ -1,24 +1,25 @@
+import argparse
+
+from juliacall import Main
+from juliacall.repl import run_repl, add_repl_args
+
+
 if __name__ == '__main__':
-    import argparse
     parser = argparse.ArgumentParser("JuliaCall REPL (experimental)")
     parser.add_argument('-e', '--eval', type=str, default=None, help='Evaluate <expr>. If specified, all other arguments are ignored.')
     parser.add_argument('-E', '--print', type=str, default=None, help='Evaluate <expr> and display the result. If specified, all other arguments are ignored.')
 
-    from juliacall.repl import add_repl_args
     add_repl_args(parser)
 
     args = parser.parse_args()
     assert not (args.eval is not None and args.print is not None), "Cannot specify both -e/--eval and -E/--print"
 
     if args.eval is not None:
-        from juliacall import Main
         Main.seval(args.eval)
     elif args.print is not None:
-        from juliacall import Main
         result = Main.seval(args.print)
         Main.display(result)
     else:
-        from juliacall.repl import run_repl
         run_repl(
             banner=args.banner,
             quiet=args.quiet,

pysrc/juliacall/init.py

@@ -1,9 +1,12 @@
+import json
+import juliapkg
+import sys
+
 if __name__ == '__main__':
-    import juliacall as _  # calls init() which calls juliapkg.executable() which lazily downloads julia
+    # invoking python -m juliacall.init automatically imports juliacall which
+    # calls init() which calls juliapkg.executable() which lazily downloads julia
 
-    import sys
     if "--debug" in sys.argv:
-        import juliapkg, json
         state = juliapkg.state.STATE
         state["version"] = str(state["version"])
         print(json.dumps(state, indent=2))

pysrc/juliacall/repl.py

@@ -1,12 +1,15 @@
+import argparse
+import os
+from pathlib import Path
+
+from juliacall import Main, Base
+
 def run_repl(banner='yes', quiet=False, history_file='yes', preamble=None):
-    import os
     os.environ.setdefault("PYTHON_JULIACALL_HANDLE_SIGNALS", "yes")
     if os.environ.get("PYTHON_JULIACALL_HANDLE_SIGNALS") != "yes":
         print("Experimental JuliaCall REPL requires PYTHON_JULIACALL_HANDLE_SIGNALS=yes")
         exit(1)
 
-    from juliacall import Main, Base
-
     Base.is_interactive = True
 
     if not quiet:
@@ -30,16 +33,13 @@ def run_repl(banner='yes', quiet=False, history_file='yes', preamble=None):
     )
 
 def add_repl_args(parser):
-    from pathlib import Path
     parser.add_argument('--banner', choices=['yes', 'no', 'short'], default='yes', help='Enable or disable startup banner')
     parser.add_argument('--quiet', '-q', action='store_true', help='Quiet startup: no banner, suppress REPL warnings')
     parser.add_argument('--history-file', choices=['yes', 'no'], default='yes', help='Load or save history')
     parser.add_argument('--preamble', type=Path, help='Code to be included before the REPL starts')
 
 if __name__ == '__main__':
-    import argparse
     parser = argparse.ArgumentParser("JuliaCall REPL (experimental)")
-    from juliacall.repl import add_repl_args
     add_repl_args(parser)
     args = parser.parse_args()
     run_repl(args.banner, args.quiet, args.history_file, args.preamble)