1 |
commit: 8a66610eee41905f10fb132dac8982249d055791 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue May 19 19:19:35 2020 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 2 04:27:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a66610e |
7 |
|
8 |
dev-python/google-apitools: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
12 |
|
13 |
.../files/google-apitools-0.5.30-abc.patch | 81 ---------------------- |
14 |
...tools-0.5.30-skip-enum-test-on-new-python.patch | 21 ------ |
15 |
2 files changed, 102 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch |
18 |
deleted file mode 100644 |
19 |
index 32f61a3d889..00000000000 |
20 |
--- a/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch |
21 |
+++ /dev/null |
22 |
@@ -1,81 +0,0 @@ |
23 |
-commit cfefe5a8322b40c6e7bd3cc794fd644edcc3a6d6 |
24 |
-Author: Karthikeyan Singaravelan <tir.karthi@×××××.com> |
25 |
-Date: Mon Jan 27 20:21:15 2020 +0530 |
26 |
- |
27 |
- Import ABC from collections.abc instead of collections for Python 3.9 compatibility. (#286) |
28 |
- |
29 |
-diff --git a/apitools/base/py/extra_types.py b/apitools/base/py/extra_types.py |
30 |
-index 847dc91..e40a785 100644 |
31 |
---- a/apitools/base/py/extra_types.py |
32 |
-+++ b/apitools/base/py/extra_types.py |
33 |
-@@ -16,7 +16,6 @@ |
34 |
- |
35 |
- """Extra types understood by apitools.""" |
36 |
- |
37 |
--import collections |
38 |
- import datetime |
39 |
- import json |
40 |
- import numbers |
41 |
-@@ -30,6 +29,11 @@ from apitools.base.py import encoding_helper as encoding |
42 |
- from apitools.base.py import exceptions |
43 |
- from apitools.base.py import util |
44 |
- |
45 |
-+if six.PY3: |
46 |
-+ from collections.abc import Iterable |
47 |
-+else: |
48 |
-+ from collections import Iterable |
49 |
-+ |
50 |
- __all__ = [ |
51 |
- 'DateField', |
52 |
- 'DateTimeMessage', |
53 |
-@@ -129,7 +133,7 @@ def _PythonValueToJsonValue(py_value): |
54 |
- return JsonValue(double_value=float(py_value)) |
55 |
- if isinstance(py_value, dict): |
56 |
- return JsonValue(object_value=_PythonValueToJsonObject(py_value)) |
57 |
-- if isinstance(py_value, collections.Iterable): |
58 |
-+ if isinstance(py_value, Iterable): |
59 |
- return JsonValue(array_value=_PythonValueToJsonArray(py_value)) |
60 |
- raise exceptions.InvalidDataError( |
61 |
- 'Cannot convert "%s" to JsonValue' % py_value) |
62 |
-@@ -212,7 +216,7 @@ def _JsonProtoToPythonValue(json_proto): |
63 |
- def _PythonValueToJsonProto(py_value): |
64 |
- if isinstance(py_value, dict): |
65 |
- return _PythonValueToJsonObject(py_value) |
66 |
-- if (isinstance(py_value, collections.Iterable) and |
67 |
-+ if (isinstance(py_value, Iterable) and |
68 |
- not isinstance(py_value, six.string_types)): |
69 |
- return _PythonValueToJsonArray(py_value) |
70 |
- return _PythonValueToJsonValue(py_value) |
71 |
-diff --git a/apitools/base/py/util.py b/apitools/base/py/util.py |
72 |
-index ac1a44c..ad086e4 100644 |
73 |
---- a/apitools/base/py/util.py |
74 |
-+++ b/apitools/base/py/util.py |
75 |
-@@ -16,7 +16,6 @@ |
76 |
- |
77 |
- """Assorted utilities shared between parts of apitools.""" |
78 |
- |
79 |
--import collections |
80 |
- import os |
81 |
- import random |
82 |
- |
83 |
-@@ -30,6 +29,11 @@ from apitools.base.protorpclite import messages |
84 |
- from apitools.base.py import encoding_helper as encoding |
85 |
- from apitools.base.py import exceptions |
86 |
- |
87 |
-+if six.PY3: |
88 |
-+ from collections.abc import Iterable |
89 |
-+else: |
90 |
-+ from collections import Iterable |
91 |
-+ |
92 |
- __all__ = [ |
93 |
- 'DetectGae', |
94 |
- 'DetectGce', |
95 |
-@@ -78,7 +82,7 @@ def NormalizeScopes(scope_spec): |
96 |
- if isinstance(scope_spec, six.string_types): |
97 |
- scope_spec = six.ensure_str(scope_spec) |
98 |
- return set(scope_spec.split(' ')) |
99 |
-- elif isinstance(scope_spec, collections.Iterable): |
100 |
-+ elif isinstance(scope_spec, Iterable): |
101 |
- scope_spec = [six.ensure_str(x) for x in scope_spec] |
102 |
- return set(scope_spec) |
103 |
- raise exceptions.TypecheckError( |
104 |
|
105 |
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch |
106 |
deleted file mode 100644 |
107 |
index 6003db87a97..00000000000 |
108 |
--- a/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch |
109 |
+++ /dev/null |
110 |
@@ -1,21 +0,0 @@ |
111 |
-diff --git a/apitools/base/protorpclite/descriptor_test.py b/apitools/base/protorpclite/descriptor_test.py |
112 |
-index fc27ec4..d518e24 100644 |
113 |
---- a/apitools/base/protorpclite/descriptor_test.py |
114 |
-+++ b/apitools/base/protorpclite/descriptor_test.py |
115 |
-@@ -16,6 +16,7 @@ |
116 |
- # |
117 |
- |
118 |
- """Tests for apitools.base.protorpclite.descriptor.""" |
119 |
-+import sys |
120 |
- import platform |
121 |
- import types |
122 |
- |
123 |
-@@ -78,7 +79,7 @@ class DescribeEnumTest(test_util.TestCase): |
124 |
- described.check_initialized() |
125 |
- self.assertEquals(expected, described) |
126 |
- |
127 |
-- @unittest2.skipIf('PyPy' in platform.python_implementation(), |
128 |
-+ @unittest2.skipIf('PyPy' in platform.python_implementation() or sys.hexversion >= 0x03060000, |
129 |
- 'todo: reenable this') |
130 |
- def testEnumWithItems(self): |
131 |
- class EnumWithItems(messages.Enum): |