From d7bfda713f43b7be90bd8e4024bdde9197e945f0 Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Tue, 5 Sep 2017 23:12:46 -0600 Subject: [PATCH] mofied packages with new namespaces --- pipenv/vendor/background.py | 7 +++---- pipenv/vendor/concurrent27/futures/__init__.py | 6 +++--- pipenv/vendor/concurrent27/futures/process.py | 2 +- pipenv/vendor/concurrent27/futures/thread.py | 2 +- pipenv/vendor/concurrent3/futures/__init__.py | 6 +++--- pipenv/vendor/concurrent3/futures/process.py | 2 +- pipenv/vendor/concurrent3/futures/thread.py | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pipenv/vendor/background.py b/pipenv/vendor/background.py index acd90ffd..6b9a5c0a 100644 --- a/pipenv/vendor/background.py +++ b/pipenv/vendor/background.py @@ -5,16 +5,15 @@ import sys import multiprocessing if sys.version_info.major < 3: - import concurrent3.futures as concurrent -else: import concurrent27.futures as concurrent +else: + import concurrent3.futures as concurrent def default_n(): return multiprocessing.cpu_count() - n = default_n() -pool = concurrent.futures.ThreadPoolExecutor(max_workers=n) +pool = concurrent.ThreadPoolExecutor(max_workers=n) callbacks = [] results = [] diff --git a/pipenv/vendor/concurrent27/futures/__init__.py b/pipenv/vendor/concurrent27/futures/__init__.py index 428b14bd..97461c22 100644 --- a/pipenv/vendor/concurrent27/futures/__init__.py +++ b/pipenv/vendor/concurrent27/futures/__init__.py @@ -5,7 +5,7 @@ __author__ = 'Brian Quinlan (brian@sweetapp.com)' -from concurrent.futures._base import (FIRST_COMPLETED, +from concurrent27.futures._base import (FIRST_COMPLETED, FIRST_EXCEPTION, ALL_COMPLETED, CancelledError, @@ -14,10 +14,10 @@ from concurrent.futures._base import (FIRST_COMPLETED, Executor, wait, as_completed) -from concurrent.futures.thread import ThreadPoolExecutor +from concurrent27.futures.thread import ThreadPoolExecutor try: - from concurrent.futures.process import ProcessPoolExecutor + from concurrent27.futures.process import ProcessPoolExecutor except ImportError: # some platforms don't have multiprocessing pass diff --git a/pipenv/vendor/concurrent27/futures/process.py b/pipenv/vendor/concurrent27/futures/process.py index fa5b96fd..53291ede 100644 --- a/pipenv/vendor/concurrent27/futures/process.py +++ b/pipenv/vendor/concurrent27/futures/process.py @@ -44,7 +44,7 @@ Process #1..n: """ import atexit -from concurrent.futures import _base +from concurrent27.futures import _base import Queue as queue import multiprocessing import threading diff --git a/pipenv/vendor/concurrent27/futures/thread.py b/pipenv/vendor/concurrent27/futures/thread.py index efae619a..c80f36da 100644 --- a/pipenv/vendor/concurrent27/futures/thread.py +++ b/pipenv/vendor/concurrent27/futures/thread.py @@ -4,7 +4,7 @@ """Implements ThreadPoolExecutor.""" import atexit -from concurrent.futures import _base +from concurrent27.futures import _base import Queue as queue import threading import weakref diff --git a/pipenv/vendor/concurrent3/futures/__init__.py b/pipenv/vendor/concurrent3/futures/__init__.py index b5231f8a..ee1d7b2e 100755 --- a/pipenv/vendor/concurrent3/futures/__init__.py +++ b/pipenv/vendor/concurrent3/futures/__init__.py @@ -5,7 +5,7 @@ __author__ = 'Brian Quinlan (brian@sweetapp.com)' -from concurrent.futures._base import (FIRST_COMPLETED, +from concurrent3.futures._base import (FIRST_COMPLETED, FIRST_EXCEPTION, ALL_COMPLETED, CancelledError, @@ -14,5 +14,5 @@ from concurrent.futures._base import (FIRST_COMPLETED, Executor, wait, as_completed) -from concurrent.futures.process import ProcessPoolExecutor -from concurrent.futures.thread import ThreadPoolExecutor +from concurrent3.futures.process import ProcessPoolExecutor +from concurrent3.futures.thread import ThreadPoolExecutor diff --git a/pipenv/vendor/concurrent3/futures/process.py b/pipenv/vendor/concurrent3/futures/process.py index 03b28ab5..ad9b6255 100755 --- a/pipenv/vendor/concurrent3/futures/process.py +++ b/pipenv/vendor/concurrent3/futures/process.py @@ -47,7 +47,7 @@ __author__ = 'Brian Quinlan (brian@sweetapp.com)' import atexit import os -from concurrent.futures import _base +from concurrent3.futures import _base import queue from queue import Full import multiprocessing diff --git a/pipenv/vendor/concurrent3/futures/thread.py b/pipenv/vendor/concurrent3/futures/thread.py index 0b5d5373..19e6424d 100755 --- a/pipenv/vendor/concurrent3/futures/thread.py +++ b/pipenv/vendor/concurrent3/futures/thread.py @@ -6,7 +6,7 @@ __author__ = 'Brian Quinlan (brian@sweetapp.com)' import atexit -from concurrent.futures import _base +from concurrent3.futures import _base import itertools import queue import threading