From 994f04dbf576f4ebafb9de2bc6821e15cb0de0ea Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Tue, 27 Dec 2016 15:09:36 +0200 Subject: Issue #28998: More APIs now support longs as well as ints. --- Lib/multiprocessing/pool.py | 2 +- Lib/multiprocessing/process.py | 6 +++--- Lib/multiprocessing/util.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Lib/multiprocessing') diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py index 991f87f2f1..ceb93aab86 100644 --- a/Lib/multiprocessing/pool.py +++ b/Lib/multiprocessing/pool.py @@ -86,7 +86,7 @@ class MaybeEncodingError(Exception): def worker(inqueue, outqueue, initializer=None, initargs=(), maxtasks=None): - assert maxtasks is None or (type(maxtasks) == int and maxtasks > 0) + assert maxtasks is None or (type(maxtasks) in (int, long) and maxtasks > 0) put = outqueue.put get = inqueue.get if hasattr(inqueue, '_writer'): diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py index 44c1e44242..f6b03b192a 100644 --- a/Lib/multiprocessing/process.py +++ b/Lib/multiprocessing/process.py @@ -227,7 +227,7 @@ class Process(object): else: status = 'started' - if type(status) is int: + if type(status) in (int, long): if status == 0: status = 'stopped' else: @@ -262,8 +262,8 @@ class Process(object): except SystemExit, e: if not e.args: exitcode = 1 - elif isinstance(e.args[0], int): - exitcode = e.args[0] + elif isinstance(e.args[0], (int, long)): + exitcode = int(e.args[0]) else: sys.stderr.write(str(e.args[0]) + '\n') sys.stderr.flush() diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py index 092b61ce09..394cc44a33 100644 --- a/Lib/multiprocessing/util.py +++ b/Lib/multiprocessing/util.py @@ -174,7 +174,7 @@ class Finalize(object): Class which supports object finalization using weakrefs ''' def __init__(self, obj, callback, args=(), kwargs=None, exitpriority=None): - assert exitpriority is None or type(exitpriority) is int + assert exitpriority is None or type(exitpriority) in (int, long) if obj is not None: self._weakref = weakref.ref(obj, self) -- cgit v1.2.1