Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: third_party/gsutil/gslib/name_expansion.py

Issue 1380943003: Roll version of gsutil to 4.15. (Closed) Base URL: https://github.com/catapult-project/catapult.git@master
Patch Set: rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/gsutil/gslib/hashing_helper.py ('k') | third_party/gsutil/gslib/parallelism_framework_util.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/gsutil/gslib/name_expansion.py
diff --git a/third_party/gsutil/gslib/name_expansion.py b/third_party/gsutil/gslib/name_expansion.py
index 0d8b6cae9bbb4b1dec88942eeca0ed4c70328497..ee42cde4961926952c4a8aac08533998bb8eb8bc 100644
--- a/third_party/gsutil/gslib/name_expansion.py
+++ b/third_party/gsutil/gslib/name_expansion.py
@@ -26,10 +26,10 @@ the various rules for determining how these expansions are done.
from __future__ import absolute_import
-import multiprocessing
import os
import sys
+import gslib
from gslib.exception import CommandException
from gslib.plurality_checkable_iterator import PluralityCheckableIterator
import gslib.wildcard_iterator
@@ -70,7 +70,7 @@ class NameExpansionResult(object):
self.expanded_storage_url = expanded_storage_url
def __repr__(self):
- return '%s' % self._expanded_storage_url
+ return '%s' % self.expanded_storage_url
class _NameExpansionIterator(object):
@@ -355,7 +355,7 @@ class NameExpansionIteratorQueue(object):
def __init__(self, name_expansion_iterator, final_value):
self.name_expansion_iterator = name_expansion_iterator
self.final_value = final_value
- self.lock = multiprocessing.Manager().Lock()
+ self.lock = gslib.util.manager.Lock()
def qsize(self):
raise NotImplementedError(
« no previous file with comments | « third_party/gsutil/gslib/hashing_helper.py ('k') | third_party/gsutil/gslib/parallelism_framework_util.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698