From d1a8d73911abbea41a69f3eb0fdd9fcc532b4608 Mon Sep 17 00:00:00 2001 From: Nate Prewitt Date: Mon, 24 Apr 2017 09:20:23 -0600 Subject: [PATCH] fix bad PEP reference on name normalization function --- pipenv/cli.py | 6 +++--- pipenv/project.py | 10 +++++----- pipenv/utils.py | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pipenv/cli.py b/pipenv/cli.py index 9e0df894..004a9440 100644 --- a/pipenv/cli.py +++ b/pipenv/cli.py @@ -21,7 +21,7 @@ from requests.packages.urllib3.exceptions import InsecureRequestWarning from .project import Project from .utils import (convert_deps_from_pip, convert_deps_to_pip, is_required_version, - proper_case, pep426_name, split_vcs, recase_file) + proper_case, pep423_name, split_vcs, recase_file) from .__version__ import __version__ from . import pep508checker from .environments import PIPENV_COLORBLIND, PIPENV_NOSPIN, PIPENV_SHELL_COMPAT, PIPENV_VENV_IN_PROJECT @@ -330,8 +330,8 @@ def parse_install_output(output): name = lines[0].split('(')[0] # Strip version specification. e.g. package; python-version=2.6 name = name.split(';')[0] - # Standardize name to pep426. - name = pep426_name(name.strip()) + # Standardize name to PEP 423. + name = pep423_name(name.strip()) for line in lines: r = parse.parse('Saved {file}', line.strip()) diff --git a/pipenv/project.py b/pipenv/project.py index 1cb014bc..ab103aaa 100644 --- a/pipenv/project.py +++ b/pipenv/project.py @@ -12,7 +12,7 @@ import delegator from requests.compat import OrderedDict from .utils import (format_toml, mkdir_p, convert_deps_from_pip, - pep426_name, recase_file) + pep423_name, recase_file) from .environments import PIPENV_MAX_DEPTH, PIPENV_VENV_IN_PROJECT @@ -141,8 +141,8 @@ class Project(object): p_section = pfile.get(section, {}) for key in list(p_section.keys()): - # Normalize key name to pep426. - norm_key = pep426_name(key) + # Normalize key name to PEP 423. + norm_key = pep423_name(key) p_section[norm_key] = p_section.pop(key) return pfile @@ -157,7 +157,7 @@ class Project(object): lock_section = lockfile.get(section, {}) for key in list(lock_section.keys()): - norm_key = pep426_name(key) + norm_key = pep423_name(key) lockfile[section][norm_key] = lock_section.pop(key) return lockfile @@ -204,7 +204,7 @@ class Project(object): # Read and append Pipfile. p = self._pipfile - package_name = pep426_name(package_name) + package_name = pep423_name(package_name) key = 'dev-packages' if dev else 'packages' diff --git a/pipenv/utils.py b/pipenv/utils.py index b1383f03..6822a942 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -168,8 +168,8 @@ def is_vcs(pipfile_entry): return False -def pep426_name(name): - """Normalize package name to pep426 style standard.""" +def pep423_name(name): + """Normalize package name to PEP 423 style standard.""" return name.lower().replace('_','-')