summaryrefslogtreecommitdiff
path: root/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
blob: 3437c2a2f33f0ed7b0f974ff15b376f28d003f84 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
diff --git a/pipenv/installers.py b/pipenv/installers.py
index 1e81047d..ccfd639c 100644
--- a/pipenv/installers.py
+++ b/pipenv/installers.py
@@ -6,8 +6,11 @@ from abc import ABCMeta, abstractmethod
 
 
 from .environments import PIPENV_INSTALL_TIMEOUT
-from .vendor import attr, delegator
 from .utils import find_windows_executable
+# future version of pipenv drops this
+# hence, this stays here for a while
+from .vendor import delegator
+import attr
 
 
 @attr.s
diff --git a/pipenv/vendor/passa/models/projects.py b/pipenv/vendor/passa/models/projects.py
index c7807c05..f6e037d6 100644
--- a/pipenv/vendor/passa/models/projects.py
+++ b/pipenv/vendor/passa/models/projects.py
@@ -6,7 +6,7 @@ import collections
 import io
 import os
 
-from pipenv.vendor import attr
+import attr
 import packaging.markers
 import packaging.utils
 import plette
diff --git a/pipenv/vendor/pythonfinder/models/mixins.py b/pipenv/vendor/pythonfinder/models/mixins.py
index aeba0443..76327115 100644
--- a/pipenv/vendor/pythonfinder/models/mixins.py
+++ b/pipenv/vendor/pythonfinder/models/mixins.py
@@ -5,7 +5,7 @@ import abc
 import operator
 from collections import defaultdict
 
-from pipenv.vendor import attr
+import attr
 import six
 
 from ..compat import fs_str
diff --git a/pipenv/vendor/pythonfinder/models/path.py b/pipenv/vendor/pythonfinder/models/path.py
index e8c13429..7a197181 100644
--- a/pipenv/vendor/pythonfinder/models/path.py
+++ b/pipenv/vendor/pythonfinder/models/path.py
@@ -7,7 +7,7 @@ import sys
 from collections import defaultdict
 from itertools import chain
 
-from pipenv.vendor import attr
+import attr
 import six
 from cached_property import cached_property
 from ..compat import Path, fs_str
diff --git a/pipenv/vendor/pythonfinder/models/python.py b/pipenv/vendor/pythonfinder/models/python.py
index 4f7e5563..d001a1e5 100644
--- a/pipenv/vendor/pythonfinder/models/python.py
+++ b/pipenv/vendor/pythonfinder/models/python.py
@@ -7,7 +7,7 @@ import platform
 import sys
 from collections import defaultdict
 
-from pipenv.vendor import attr
+import attr
 import six
 from packaging.version import Version
 
diff --git a/pipenv/vendor/pythonfinder/models/windows.py b/pipenv/vendor/pythonfinder/models/windows.py
index c69b9484..fb36a272 100644
--- a/pipenv/vendor/pythonfinder/models/windows.py
+++ b/pipenv/vendor/pythonfinder/models/windows.py
@@ -4,7 +4,7 @@ from __future__ import absolute_import, print_function
 import operator
 from collections import defaultdict
 
-from pipenv.vendor import attr
+import attr
 
 from ..environment import MYPY_RUNNING
 from ..exceptions import InvalidPythonVersion
diff --git a/pipenv/vendor/pythonfinder/utils.py b/pipenv/vendor/pythonfinder/utils.py
index bcea7f3e..41d2d59a 100644
--- a/pipenv/vendor/pythonfinder/utils.py
+++ b/pipenv/vendor/pythonfinder/utils.py
@@ -10,7 +10,7 @@ from collections import OrderedDict
 from fnmatch import fnmatch
 from threading import Timer
 
-from pipenv.vendor import attr
+import attr
 import six
 from packaging.version import LegacyVersion, Version