1 |
commit: 5d48806c78febc559d6ae726303f35dd32435474 |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 4 02:44:58 2020 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 4 03:08:47 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=5d48806c |
7 |
|
8 |
lib/portage/util/socks5.py: fix reimport |
9 |
|
10 |
* This drops the internal class import of the asyncio module. It is not |
11 |
available in all supported Python versions. |
12 |
|
13 |
Suggested-by: Zac Medico <zmedico <AT> gentoo.org> |
14 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
15 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
16 |
|
17 |
lib/portage/util/socks5.py | 7 +------ |
18 |
1 file changed, 1 insertion(+), 6 deletions(-) |
19 |
|
20 |
diff --git a/lib/portage/util/socks5.py b/lib/portage/util/socks5.py |
21 |
index c0657ae2a..65d2400e8 100644 |
22 |
--- a/lib/portage/util/socks5.py |
23 |
+++ b/lib/portage/util/socks5.py |
24 |
@@ -1,5 +1,5 @@ |
25 |
# SOCKSv5 proxy manager for network-sandbox |
26 |
-# Copyright 2015-2019 Gentoo Authors |
27 |
+# Copyright 2015-2020 Gentoo Authors |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
|
30 |
import errno |
31 |
@@ -14,7 +14,6 @@ from portage.process import atexit_register, spawn |
32 |
from portage.util.futures.compat_coroutine import coroutine |
33 |
from portage.util.futures import asyncio |
34 |
|
35 |
- |
36 |
class ProxyManager: |
37 |
""" |
38 |
A class to start and control a single running SOCKSv5 server process |
39 |
@@ -33,10 +32,6 @@ class ProxyManager: |
40 |
paths) |
41 |
@type settings: portage.config |
42 |
""" |
43 |
- try: |
44 |
- import asyncio # NOQA |
45 |
- except ImportError: |
46 |
- raise NotImplementedError('SOCKSv5 proxy requires asyncio module') |
47 |
|
48 |
tmpdir = os.path.join(settings['PORTAGE_TMPDIR'], 'portage') |
49 |
ensure_dirs_kwargs = {} |