Merge pull request #12612 from jpavlav/pathlib_everywhere

IPython/core/magics/packaging.py

@@ -1,104 +1,105 b''
 """Implementation of packaging-related magic functions.
 """
 #-----------------------------------------------------------------------------
 #  Copyright (c) 2018 The IPython Development Team.
 #
 #  Distributed under the terms of the Modified BSD License.
 #
 #  The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 import re
 import shlex
 import sys
+from pathlib import Path
 
 from pathlib import Path
 from IPython.core.magic import Magics, magics_class, line_magic
 
 
 def _is_conda_environment():
     """Return True if the current Python executable is in a conda env"""
     # TODO: does this need to change on windows?
     return Path(sys.prefix, "conda-meta", "history").exists()
 
 
 def _get_conda_executable():
     """Find the path to the conda executable"""
     # Check if there is a conda executable in the same directory as the Python executable.
     # This is the case within conda's root environment.
     conda = Path(sys.executable).parent / "conda"
     if conda.isfile():
         return str(conda)
 
     # Otherwise, attempt to extract the executable from conda history.
     # This applies in any conda environment.
     history = Path(sys.prefix, "conda-meta", "history").read_text()
     match = re.search(
         r"^#\s*cmd:\s*(?P<command>.*conda)\s[create|install]",
         history,
         flags=re.MULTILINE,
     )
     if match:
         return match.groupdict()["command"]
     
     # Fallback: assume conda is available on the system path.
     return "conda"
 
 
 CONDA_COMMANDS_REQUIRING_PREFIX = {
     'install', 'list', 'remove', 'uninstall', 'update', 'upgrade',
 }
 CONDA_COMMANDS_REQUIRING_YES = {
     'install', 'remove', 'uninstall', 'update', 'upgrade',
 }
 CONDA_ENV_FLAGS = {'-p', '--prefix', '-n', '--name'}
 CONDA_YES_FLAGS = {'-y', '--y'}
 
 
 @magics_class
 class PackagingMagics(Magics):
     """Magics related to packaging & installation"""
 
     @line_magic
     def pip(self, line):
         """Run the pip package manager within the current kernel.
 
         Usage:
           %pip install [pkgs]
         """
         self.shell.system(' '.join([sys.executable, '-m', 'pip', line]))
         print("Note: you may need to restart the kernel to use updated packages.")
 
     @line_magic
     def conda(self, line):
         """Run the conda package manager within the current kernel.
         
         Usage:
           %conda install [pkgs]
         """
         if not _is_conda_environment():
             raise ValueError("The python kernel does not appear to be a conda environment.  "
                              "Please use ``%pip install`` instead.")
         
         conda = _get_conda_executable()
         args = shlex.split(line)
         command = args[0]
         args = args[1:]
         extra_args = []
 
         # When the subprocess does not allow us to respond "yes" during the installation,
         # we need to insert --yes in the argument list for some commands
         stdin_disabled = getattr(self.shell, 'kernel', None) is not None
         needs_yes = command in CONDA_COMMANDS_REQUIRING_YES
         has_yes = set(args).intersection(CONDA_YES_FLAGS)
         if stdin_disabled and needs_yes and not has_yes:
             extra_args.append("--yes")
 
         # Add --prefix to point conda installation to the current environment
         needs_prefix = command in CONDA_COMMANDS_REQUIRING_PREFIX
         has_prefix = set(args).intersection(CONDA_ENV_FLAGS)
         if needs_prefix and not has_prefix:
             extra_args.extend(["--prefix", sys.prefix])
 
         self.shell.system(' '.join([conda, command] + extra_args + args))
         print("\nNote: you may need to restart the kernel to use updated packages.")

tools/gen_latex_symbols.py

@@ -1,88 +1,87 b''
 # coding: utf-8
 
 # This script autogenerates `IPython.core.latex_symbols.py`, which contains a
 # single dict , named `latex_symbols`. The keys in this dict are latex symbols,
 # such as `\\alpha` and the values in the dict are the unicode equivalents for
 # those. Most importantly, only unicode symbols that are valid identifiers in
 # Python 3 are included. 
 
 # 
 # The original mapping of latex symbols to unicode comes from the `latex_symbols.jl` files from Julia.
 
-import os, sys
+from pathlib import Path
 
 # Import the Julia LaTeX symbols
 print('Importing latex_symbols.js from Julia...')
 import requests
 url = 'https://raw.githubusercontent.com/JuliaLang/julia/master/stdlib/REPL/src/latex_symbols.jl'
 r = requests.get(url)
 
 
 # Build a list of key, value pairs
 print('Building a list of (latex, unicode) key-value pairs...')
 lines = r.text.splitlines()
 
 prefixes_line = lines.index('# "font" prefixes')
 symbols_line = lines.index('# manual additions:')
 
 prefix_dict = {}
 for l in lines[prefixes_line + 1: symbols_line]:
     p = l.split()
     if not p or p[1] == 'latex_symbols': continue
     prefix_dict[p[1]] = p[3]
 
 idents = []
 for l in lines[symbols_line:]:
     if not '=>' in l: continue # if it's not a def, skip
     if '#' in l: l = l[:l.index('#')] # get rid of eol comments
     x, y = l.strip().split('=>') 
     if '*' in x: # if a prefix is present substitute it with its value
         p, x = x.split('*')
         x = prefix_dict[p][:-1] + x[1:]
     x, y = x.split('"')[1], y.split('"')[1] # get the values in quotes
     idents.append((x, y))
 
 # Filter out non-valid identifiers
 print('Filtering out characters that are not valid Python 3 identifiers')
 
 def test_ident(i):
     """Is the unicode string valid in a Python 3 identifier."""
     # Some characters are not valid at the start of a name, but we still want to
     # include them. So prefix with 'a', which is valid at the start.
     return ('a' + i).isidentifier()
 
 assert test_ident("α")
 assert not test_ident('‴')
 
 valid_idents = [line for line in idents if test_ident(line[1])]
 
 # Write the `latex_symbols.py` module in the cwd
 
 s = """# encoding: utf-8
 
 # DO NOT EDIT THIS FILE BY HAND.
 
 # To update this file, run the script /tools/gen_latex_symbols.py using Python 3
 
 # This file is autogenerated from the file:
 # https://raw.githubusercontent.com/JuliaLang/julia/master/base/latex_symbols.jl
 # This original list is filtered to remove any unicode characters that are not valid
 # Python identifiers.
 
 latex_symbols = {\n
 """
 for line in valid_idents:
     s += '    "%s" : "%s",\n' % (line[0], line[1])
 s += "}\n"
 
 s += """
 
 reverse_latex_symbol = { v:k for k,v in latex_symbols.items()}
 """
 
-fn = os.path.join('..','IPython','core','latex_symbols.py')
-print("Writing the file: %s" % fn)
-with open(fn, 'w', encoding='utf-8') as f:
-    f.write(s)
+fn = Path("..", "IPython", "core", "latex_symbols.py")
+print("Writing the file: %s" % str(fn))
+fn.write_text(s, encoding="utf-8")