mirror of
https://github.com/kennethreitz/pipenv.git
synced 2026-06-05 22:50:18 +00:00
Dan Ryan
bd7b6004fe
- Fix attempted hashing of `ssh://` urls - Fix URL parsing and conversions of `git` and `git+ssh` style vcs urls - Fixes #2653 - Fixes #2446 - Update lockfile - Vendor typing - Add typing to setup.py - Add click completion patch and update vendoring task - Fix vendoring script - Vendor enum34 - Update requirementslib and cleanup vcs check functionality - Move enum and adjust patched click completion - Update click completion - Bump requirementslib again - Move typing to backports, update tests - Update tomlkit imports and backport typing module Signed-off-by: Dan Ryan <dan@danryan.co>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
diff --git a/pipenv/vendor/click_completion/__init__.py b/pipenv/vendor/click_completion/__init__.py
|
|
index 1443c8f..b849ae2 100644
|
|
--- a/pipenv/vendor/click_completion/__init__.py
|
|
+++ b/pipenv/vendor/click_completion/__init__.py
|
|
@@ -6,7 +6,13 @@ from __future__ import print_function, absolute_import
|
|
import six
|
|
|
|
from click import ParamType
|
|
-from enum import Enum
|
|
+if six.PY3:
|
|
+ try:
|
|
+ from enum import Enum
|
|
+ except ImportError:
|
|
+ from pipenv.vendor.backports.enum import Enum
|
|
+else:
|
|
+ from pipenv.vendor.backports.enum import Enum
|
|
|
|
from click_completion.core import completion_configuration, get_code, install, shells, resolve_ctx, get_choices, \
|
|
startswith, Shell
|
|
diff --git a/pipenv/vendor/click_completion/core.py b/pipenv/vendor/click_completion/core.py
|
|
index 2ede6ef..dc47d47 100644
|
|
--- a/pipenv/vendor/click_completion/core.py
|
|
+++ b/pipenv/vendor/click_completion/core.py
|
|
@@ -10,7 +10,14 @@ import subprocess
|
|
|
|
import click
|
|
from click import Option, Argument, MultiCommand, echo
|
|
-from enum import Enum
|
|
+import six
|
|
+if six.PY3:
|
|
+ try:
|
|
+ from enum import Enum
|
|
+ except ImportError:
|
|
+ from pipenv.vendor.backports.enum import Enum
|
|
+else:
|
|
+ from pipenv.vendor.backports.enum import Enum
|
|
|
|
from click_completion.lib import resolve_ctx, split_args, single_quote, double_quote, get_auto_shell
|
|
|