D3264: futures: switch to absolute and relative imports
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Fri Apr 13 17:45:21 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0a9c0d3480b2: futures: switch to absolute and relative imports (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3264?vs=8030&id=8162
REVISION DETAIL
https://phab.mercurial-scm.org/D3264
AFFECTED FILES
mercurial/thirdparty/concurrent/futures/__init__.py
mercurial/thirdparty/concurrent/futures/_base.py
mercurial/thirdparty/concurrent/futures/process.py
mercurial/thirdparty/concurrent/futures/thread.py
CHANGE DETAILS
diff --git a/mercurial/thirdparty/concurrent/futures/thread.py b/mercurial/thirdparty/concurrent/futures/thread.py
--- a/mercurial/thirdparty/concurrent/futures/thread.py
+++ b/mercurial/thirdparty/concurrent/futures/thread.py
@@ -3,8 +3,10 @@
"""Implements ThreadPoolExecutor."""
+from __future__ import absolute_import
+
import atexit
-from concurrent.futures import _base
+from . import _base
import itertools
import Queue as queue
import threading
diff --git a/mercurial/thirdparty/concurrent/futures/process.py b/mercurial/thirdparty/concurrent/futures/process.py
--- a/mercurial/thirdparty/concurrent/futures/process.py
+++ b/mercurial/thirdparty/concurrent/futures/process.py
@@ -43,8 +43,10 @@
_ResultItems in "Request Q"
"""
+from __future__ import absolute_import
+
import atexit
-from concurrent.futures import _base
+from . import _base
import Queue as queue
import multiprocessing
import threading
diff --git a/mercurial/thirdparty/concurrent/futures/_base.py b/mercurial/thirdparty/concurrent/futures/_base.py
--- a/mercurial/thirdparty/concurrent/futures/_base.py
+++ b/mercurial/thirdparty/concurrent/futures/_base.py
@@ -1,6 +1,8 @@
# Copyright 2009 Brian Quinlan. All Rights Reserved.
# Licensed to PSF under a Contributor Agreement.
+from __future__ import absolute_import
+
import collections
import logging
import threading
diff --git a/mercurial/thirdparty/concurrent/futures/__init__.py b/mercurial/thirdparty/concurrent/futures/__init__.py
--- a/mercurial/thirdparty/concurrent/futures/__init__.py
+++ b/mercurial/thirdparty/concurrent/futures/__init__.py
@@ -3,21 +3,25 @@
"""Execute computations asynchronously using threads or processes."""
+from __future__ import absolute_import
+
__author__ = 'Brian Quinlan (brian at sweetapp.com)'
-from concurrent.futures._base import (FIRST_COMPLETED,
- FIRST_EXCEPTION,
- ALL_COMPLETED,
- CancelledError,
- TimeoutError,
- Future,
- Executor,
- wait,
- as_completed)
-from concurrent.futures.thread import ThreadPoolExecutor
+from ._base import (
+ FIRST_COMPLETED,
+ FIRST_EXCEPTION,
+ ALL_COMPLETED,
+ CancelledError,
+ TimeoutError,
+ Future,
+ Executor,
+ wait,
+ as_completed,
+)
+from .thread import ThreadPoolExecutor
try:
- from concurrent.futures.process import ProcessPoolExecutor
+ from .process import ProcessPoolExecutor
except ImportError:
# some platforms don't have multiprocessing
pass
To: indygreg, #hg-reviewers, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list