File: unvendorize-six-and-yaml.patch

package info (click to toggle)
python-invoke 1.4.1%2Bds-0.1
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 1,704 kB
  • sloc: python: 11,377; makefile: 18; sh: 12
file content (126 lines) | stat: -rw-r--r-- 3,223 bytes parent folder | download
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
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
Description: Unvendorize six and yaml
 Upstream is using an embedded version of six and python-yaml.
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2016-02-17

--- a/invoke/util.py
+++ b/invoke/util.py
@@ -20,13 +20,9 @@
 # attribute access, since six.moves does import shenanigans.)
 try:
     from .vendor.lexicon import Lexicon  # noqa
-    from .vendor import six
-    from .vendor.six.moves import reduce  # noqa
-
-    if six.PY3:
-        from .vendor import yaml3 as yaml  # noqa
-    else:
-        from .vendor import yaml2 as yaml  # noqa
+    import six
+    from six.moves import reduce  # noqa
+    import yaml
 except ImportError:
     from lexicon import Lexicon  # noqa
     import six
--- a/integration/_support/respond_base.py
+++ b/integration/_support/respond_base.py
@@ -1,6 +1,6 @@
 import sys
 
-from invoke.vendor.six.moves import input
+from six.moves import input
 
 if input("What's the password?") != "Rosebud":
     sys.exit(1)
--- a/integration/_support/respond_both.py
+++ b/integration/_support/respond_both.py
@@ -1,6 +1,6 @@
 import sys
 
-from invoke.vendor.six.moves import input
+from six.moves import input
 
 if input("standard out") != "with it":
     sys.exit(1)
--- a/integration/_support/respond_fail.py
+++ b/integration/_support/respond_fail.py
@@ -1,4 +1,4 @@
-from invoke.vendor.six.moves import input
+from six.moves import input
 
 if input("What's the password?") == "Rosebud":
     print("You're not Citizen Kane!")
--- a/integration/_util.py
+++ b/integration/_util.py
@@ -3,7 +3,7 @@
 import sys
 import time
 
-from invoke.vendor.six import wraps
+from six import wraps
 
 from pytest import skip
 
--- a/invoke/context.py
+++ b/invoke/context.py
@@ -3,7 +3,7 @@
 from contextlib import contextmanager
 
 try:
-    from invoke.vendor.six import raise_from, iteritems
+    from six import raise_from, iteritems
 except ImportError:
     from six import raise_from, iteritems
 
--- a/tests/_util.py
+++ b/tests/_util.py
@@ -8,7 +8,7 @@
     termios = None
 from contextlib import contextmanager
 
-from invoke.vendor.six import BytesIO, b, wraps
+from six import BytesIO, b, wraps
 
 from mock import patch, Mock
 from pytest import skip
--- a/tests/concurrency.py
+++ b/tests/concurrency.py
@@ -1,4 +1,4 @@
-from invoke.vendor.six.moves.queue import Queue
+from six.moves.queue import Queue
 
 from invoke.util import ExceptionWrapper, ExceptionHandlingThread as EHThread
 
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,7 +3,7 @@
 import sys
 import termios
 
-from invoke.vendor.six import iteritems
+from six import iteritems
 import pytest
 from mock import patch
 
--- a/tests/runners.py
+++ b/tests/runners.py
@@ -8,7 +8,7 @@
 from io import BytesIO
 from itertools import chain, repeat
 
-from invoke.vendor.six import StringIO, b, PY2, iteritems
+from six import StringIO, b, PY2, iteritems
 
 from pytest import raises, skip
 from pytest_relaxed import trap
--- a/tests/watchers.py
+++ b/tests/watchers.py
@@ -1,6 +1,6 @@
 from threading import Thread, Event
 
-from invoke.vendor.six.moves.queue import Queue, Empty
+from six.moves.queue import Queue, Empty
 
 from invoke import Responder, FailingResponder, ResponseNotAccepted