summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorHugo van Kemenade <hugovk@users.noreply.github.com>2022-12-14 11:37:11 (GMT)
committerGitHub <noreply@github.com>2022-12-14 11:37:11 (GMT)
commit3192c00a3cf136e06592d9a14d4d7b82412da4de (patch)
tree0205879580c14c39eef25716c388c147dca94ff0 /Doc/library
parent6997e77bdf2297375962aaf82876da4e7ecdd61a (diff)
downloadcpython-3192c00a3cf136e06592d9a14d4d7b82412da4de.zip
cpython-3192c00a3cf136e06592d9a14d4d7b82412da4de.tar.gz
cpython-3192c00a3cf136e06592d9a14d4d7b82412da4de.tar.bz2
gh-100176: venv: Remove redundant compat code for Python <= 3.2 (#100177)
gh-100176: Remove redundant compat code for Python 3.2 and older Python 3.2 has been EOL since 2016-02-20 and 2.7 since 2020-01-01, so we can remove this old compatibility check and unindent the old else-block. Also, in the unindented block, replace a .format() call with an f-string. Plus similar changes in the documentation.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/venv.rst128
1 files changed, 60 insertions, 68 deletions
diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst
index adc6cd3..2a41096 100644
--- a/Doc/library/venv.rst
+++ b/Doc/library/venv.rst
@@ -497,76 +497,68 @@ subclass which installs setuptools and pip into a created virtual environment::
url = 'https://bootstrap.pypa.io/get-pip.py'
self.install_script(context, 'pip', url)
+
def main(args=None):
- compatible = True
- if sys.version_info < (3, 3):
- compatible = False
- elif not hasattr(sys, 'base_prefix'):
- compatible = False
- if not compatible:
- raise ValueError('This script is only for use with '
- 'Python 3.3 or later')
+ import argparse
+
+ parser = argparse.ArgumentParser(prog=__name__,
+ description='Creates virtual Python '
+ 'environments in one or '
+ 'more target '
+ 'directories.')
+ parser.add_argument('dirs', metavar='ENV_DIR', nargs='+',
+ help='A directory in which to create the '
+ 'virtual environment.')
+ parser.add_argument('--no-setuptools', default=False,
+ action='store_true', dest='nodist',
+ help="Don't install setuptools or pip in the "
+ "virtual environment.")
+ parser.add_argument('--no-pip', default=False,
+ action='store_true', dest='nopip',
+ help="Don't install pip in the virtual "
+ "environment.")
+ parser.add_argument('--system-site-packages', default=False,
+ action='store_true', dest='system_site',
+ help='Give the virtual environment access to the '
+ 'system site-packages dir.')
+ if os.name == 'nt':
+ use_symlinks = False
else:
- import argparse
-
- parser = argparse.ArgumentParser(prog=__name__,
- description='Creates virtual Python '
- 'environments in one or '
- 'more target '
- 'directories.')
- parser.add_argument('dirs', metavar='ENV_DIR', nargs='+',
- help='A directory in which to create the '
- 'virtual environment.')
- parser.add_argument('--no-setuptools', default=False,
- action='store_true', dest='nodist',
- help="Don't install setuptools or pip in the "
- "virtual environment.")
- parser.add_argument('--no-pip', default=False,
- action='store_true', dest='nopip',
- help="Don't install pip in the virtual "
- "environment.")
- parser.add_argument('--system-site-packages', default=False,
- action='store_true', dest='system_site',
- help='Give the virtual environment access to the '
- 'system site-packages dir.')
- if os.name == 'nt':
- use_symlinks = False
- else:
- use_symlinks = True
- parser.add_argument('--symlinks', default=use_symlinks,
- action='store_true', dest='symlinks',
- help='Try to use symlinks rather than copies, '
- 'when symlinks are not the default for '
- 'the platform.')
- parser.add_argument('--clear', default=False, action='store_true',
- dest='clear', help='Delete the contents of the '
- 'virtual environment '
- 'directory if it already '
- 'exists, before virtual '
- 'environment creation.')
- parser.add_argument('--upgrade', default=False, action='store_true',
- dest='upgrade', help='Upgrade the virtual '
- 'environment directory to '
- 'use this version of '
- 'Python, assuming Python '
- 'has been upgraded '
- 'in-place.')
- parser.add_argument('--verbose', default=False, action='store_true',
- dest='verbose', help='Display the output '
- 'from the scripts which '
- 'install setuptools and pip.')
- options = parser.parse_args(args)
- if options.upgrade and options.clear:
- raise ValueError('you cannot supply --upgrade and --clear together.')
- builder = ExtendedEnvBuilder(system_site_packages=options.system_site,
- clear=options.clear,
- symlinks=options.symlinks,
- upgrade=options.upgrade,
- nodist=options.nodist,
- nopip=options.nopip,
- verbose=options.verbose)
- for d in options.dirs:
- builder.create(d)
+ use_symlinks = True
+ parser.add_argument('--symlinks', default=use_symlinks,
+ action='store_true', dest='symlinks',
+ help='Try to use symlinks rather than copies, '
+ 'when symlinks are not the default for '
+ 'the platform.')
+ parser.add_argument('--clear', default=False, action='store_true',
+ dest='clear', help='Delete the contents of the '
+ 'virtual environment '
+ 'directory if it already '
+ 'exists, before virtual '
+ 'environment creation.')
+ parser.add_argument('--upgrade', default=False, action='store_true',
+ dest='upgrade', help='Upgrade the virtual '
+ 'environment directory to '
+ 'use this version of '
+ 'Python, assuming Python '
+ 'has been upgraded '
+ 'in-place.')
+ parser.add_argument('--verbose', default=False, action='store_true',
+ dest='verbose', help='Display the output '
+ 'from the scripts which '
+ 'install setuptools and pip.')
+ options = parser.parse_args(args)
+ if options.upgrade and options.clear:
+ raise ValueError('you cannot supply --upgrade and --clear together.')
+ builder = ExtendedEnvBuilder(system_site_packages=options.system_site,
+ clear=options.clear,
+ symlinks=options.symlinks,
+ upgrade=options.upgrade,
+ nodist=options.nodist,
+ nopip=options.nopip,
+ verbose=options.verbose)
+ for d in options.dirs:
+ builder.create(d)
if __name__ == '__main__':
rc = 1