update version and submodule, also sync with bpo-34819

wwqgtxx · Oct 8, 2018 · 5726b61 · 5726b61
1 parent c57db55
commit 5726b61
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/wwqLyParse/common/concurrent_futures/_base.py b/wwqLyParse/common/concurrent_futures/_base.py
@@ -212,7 +212,7 @@ def as_completed(fs, timeout=None):
             before the given timeout.
     """
     if timeout is not None:
-        end_time = timeout + time.time()
+        end_time = timeout + time.monotonic()
 
     fs = set(fs)
     total_futures = len(fs)
@@ -231,7 +231,7 @@ def as_completed(fs, timeout=None):
             if timeout is None:
                 wait_timeout = None
             else:
-                wait_timeout = end_time - time.time()
+                wait_timeout = end_time - time.monotonic()
                 if wait_timeout < 0:
                     raise TimeoutError(
                             '%d (of %d) futures unfinished' % (
@@ -550,7 +550,7 @@ def map(self, fn, *iterables, timeout=None, chunksize=1):
             Exception: If fn(*args) raises for any values.
         """
         if timeout is not None:
-            end_time = timeout + time.time()
+            end_time = timeout + time.monotonic()
 
         fs = [self.submit(fn, *args) for args in zip(*iterables)]
 
@@ -565,7 +565,7 @@ def result_iterator():
                     if timeout is None:
                         yield fs.pop().result()
                     else:
-                        yield fs.pop().result(end_time - time.time())
+                        yield fs.pop().result(end_time - time.monotonic())
             finally:
                 for future in fs:
                     future.cancel()

diff --git a/wwqLyParse/version.txt b/wwqLyParse/version.txt
@@ -1 +1 @@
-1.5.8
+1.5.9
diff --git a/wwqLyParse/ykdl b/wwqLyParse/ykdl
+2 −0		ykdl/extractors/netease/__init__.py
+26 −0		ykdl/extractors/netease/m3g.py
+15 −2		ykdl/extractors/weibo.py