Gentoo Archives: gentoo-portage-dev

From: Aaron Bauman <bman@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Aaron Bauman <bman@g.o>, Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH 4/4] lib/portage/util/socks5.py: fix reimport
Date: Tue, 04 Aug 2020 02:45:16
Message-Id: 20200804024458.2228759-4-bman@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 1/4] pylintrc: turn on checks for reimported modules by Aaron Bauman
1 * This drops the internal class import of the asyncio module. It is not
2 available in all supported Python versions.
3
4 Suggested-by: Zac Medico <zmedico@g.o>
5 Signed-off-by: Aaron Bauman <bman@g.o>
6 ---
7 lib/portage/util/socks5.py | 7 +------
8 1 file changed, 1 insertion(+), 6 deletions(-)
9
10 diff --git a/lib/portage/util/socks5.py b/lib/portage/util/socks5.py
11 index c0657ae2a..65d2400e8 100644
12 --- a/lib/portage/util/socks5.py
13 +++ b/lib/portage/util/socks5.py
14 @@ -1,5 +1,5 @@
15 # SOCKSv5 proxy manager for network-sandbox
16 -# Copyright 2015-2019 Gentoo Authors
17 +# Copyright 2015-2020 Gentoo Authors
18 # Distributed under the terms of the GNU General Public License v2
19
20 import errno
21 @@ -14,7 +14,6 @@ from portage.process import atexit_register, spawn
22 from portage.util.futures.compat_coroutine import coroutine
23 from portage.util.futures import asyncio
24
25 -
26 class ProxyManager:
27 """
28 A class to start and control a single running SOCKSv5 server process
29 @@ -33,10 +32,6 @@ class ProxyManager:
30 paths)
31 @type settings: portage.config
32 """
33 - try:
34 - import asyncio # NOQA
35 - except ImportError:
36 - raise NotImplementedError('SOCKSv5 proxy requires asyncio module')
37
38 tmpdir = os.path.join(settings['PORTAGE_TMPDIR'], 'portage')
39 ensure_dirs_kwargs = {}
40 --
41 2.28.0