Merge lp:~mordred/swift/fix-pep8 into lp:~hudson-openstack/swift/trunk

[Monty Taylor]

Fixed PEP8 warnings

Went through and fixed all of the PEP8 warnings. There is one warning that
is crap and we should submit a bug to pep8 - lambda *exc_info: gets pinged
with "space needed around operator" - except that the * isn't an operator,
it's an argument modifier. I suppose the other approach would be to go ahead
and stop using lamba since it's gone in py3 anyway...

[gholt (gholt)]

Lambda's gone in Python 3? You made me cry a little, but I still see it at http://docs.python.org/py3k/reference/expressions.html#lambda

Thanks for doing this PEP8 stuff. It's about as much fun as eating poi. I know, I've been through this codebase before trying to PEP8 it. :)

This looks good, with the really minor nit on the last change where I don't think you need the +

review: Approve

[Monty Taylor (mordred)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 07/26/2010 07:27 AM, gholt wrote:
> Review: Approve
> Lambda's gone in Python 3? You made me cry a little, but I still see it at http://docs.python.org/py3k/reference/expressions.html#lambda
>
> Thanks for doing this PEP8 stuff. It's about as much fun as eating poi. I know, I've been through this codebase before trying to PEP8 it. :)
>
> This looks good, with the really minor nit on the last change where I don't think you need the +
>

Oh balls. I thought I'd gotten rid of the string +'s. Thanks - I'll fix
that.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkxNpO0ACgkQ2Jv7/VK1RgGDOgCg8weLNlKWD20KKBGYCPTIVqK3
Jw8AoK/G+pjUlhyaFL3LMa1TU5yXUwUl
=kGKZ
-----END PGP SIGNATURE-----

[lp:~mordred/swift/fix-pep8]

42. By Monty Taylor on 2010-07-26

Removed needless continuation markers.

[Chuck Thier (cthier)]

Looks fine to me as well, unit tests and functional tests pass on my VM.

review: Approve

=== modified file 'swift/account/reaper.py'
--- swift/account/reaper.py	2010-07-19 16:25:18 +0000
+++ swift/account/reaper.py	2010-07-26 15:23:43 +0000
@@ -180,7 +180,7 @@
         only delete one account at any given time. It will call
         :func:`reap_container` up to sqrt(self.concurrency) times concurrently
         while reaping the account.
-        
+
         If there is any exception while deleting a single container, the
         process will continue for any other containers and the failed
         containers will be tried again the next time this function is called
@@ -201,7 +201,8 @@
         :param partition: The partition in the account ring the account is on.
         :param nodes: The primary node dicts for the account to delete.
 
-        * See also: :class:`swift.common.db.AccountBroker` for the broker class.
+        * See also: :class:`swift.common.db.AccountBroker` for the broker
+        class.
         * See also: :func:`swift.common.ring.Ring.get_nodes` for a description
           of the node dicts.
         """
@@ -241,7 +242,8 @@
         if self.stats_objects_deleted:
             log += ', %s objects deleted' % self.stats_objects_deleted
         if self.stats_containers_remaining:
-            log += ', %s containers remaining' % self.stats_containers_remaining
+            log += ', %s containers remaining' % \
+                   self.stats_containers_remaining
         if self.stats_objects_remaining:
             log += ', %s objects remaining' % self.stats_objects_remaining
         if self.stats_containers_possibly_remaining:

=== modified file 'swift/account/server.py'
--- swift/account/server.py	2010-07-25 01:03:56 +0000
+++ swift/account/server.py	2010-07-26 15:23:43 +0000
@@ -121,7 +121,8 @@
         # refactor out the container existence check here and retest
         # everything.
         try:
-            drive, part, account, container = split_path(unquote(req.path), 3, 4)
+            drive, part, account, container = split_path(unquote(req.path),
+                                                         3, 4)
         except ValueError, err:
             return HTTPBadRequest(body=str(err), content_type='text/plain',
                                                     request=req)
@@ -139,8 +140,7 @@
             'X-Account-Object-Count': info['object_count'],
             'X-Account-Bytes-Used': info['bytes_used'],
             'X-Timestamp': info['created_at'],
-            'X-PUT-Timestamp': info['put_timestamp'],
-        }
+            'X-PUT-Timestamp': info['put_timestamp']}
         if container:
             container_ts = broker.get_container_timestamp(container)
             if container_ts is not None:
@@ -167,8 +167,7 @@
             'X-Account-Object-Count': info['object_count'],
             'X-Account-Bytes-Used': info['bytes_used'],
             'X-Timestamp': info['created_at'],
-            'X-PUT-Timestamp': info['put_timestamp']
-        }
+            'X-PUT-Timestamp': info['put_timestamp']}
         try:
             prefix = get_param(req, 'prefix')
             delimiter = get_param(req, 'delimiter')
@@ -203,7 +202,7 @@
             for (name, object_count, bytes_used, is_subdir) in account_list:
                 name = simplejson.dumps(name)
                 if is_subdir:
-                    json_out.append('{"subdir":%s}'% name)
+                    json_out.append('{"subdir":%s}' % name)
                 else:
                     json_out.append(json_pattern %
                         (name, object_count, bytes_used))
@@ -211,7 +210,7 @@
         elif format == 'xml':
             out_content_type = 'application/xml'
             output_list = ['<?xml version="1.0" encoding="UTF-8"?>',
-                           '<account name="%s">'%account]
+                           '<account name="%s">' % account]
             for (name, object_count, bytes_used, is_subdir) in account_list:
                 name = saxutils.escape(name)
                 if is_subdir:
@@ -292,4 +291,3 @@
         else:
             self.logger.info(log_message)
         return res(env, start_response)
-

=== modified file 'swift/auth/server.py'
--- swift/auth/server.py	2010-07-19 16:25:18 +0000
+++ swift/auth/server.py	2010-07-26 15:23:43 +0000
@@ -140,7 +140,7 @@
             try:
                 conn = None
                 conn = http_connect(node['ip'], node['port'], node['device'],
-                        partition, 'PUT', '/'+account_name, headers)
+                        partition, 'PUT', '/' + account_name, headers)
                 source = conn.getresponse()
                 statuses.append(source.status)
                 if source.status >= 500:
@@ -358,7 +358,7 @@
         :param request: webob.Request object
         """
         result = self.recreate_accounts()
-        return Response(result, 200, request = request)
+        return Response(result, 200, request=request)
 
     def handle_auth(self, request):
         """
@@ -438,7 +438,6 @@
                                           'x-storage-token': token,
                                           'x-storage-url': url})
 
-
     def handleREST(self, env, start_response):
         """
         Handles routing of ReST requests. This handler also logs all requests.
@@ -452,7 +451,7 @@
             logged_headers = '\n'.join('%s: %s' % (k, v)
                 for k, v in req.headers.items()).replace('"', "#042")
         start_time = time()
-        # Figure out how to handle the request 
+        # Figure out how to handle the request
         try:
             if req.method == 'GET' and req.path.startswith('/v1') or \
                     req.path.startswith('/auth'):

=== modified file 'swift/common/__init__.py'
--- swift/common/__init__.py	2010-07-08 01:37:44 +0000
+++ swift/common/__init__.py	2010-07-26 15:23:43 +0000
@@ -3,4 +3,3 @@
 ACCOUNT_LISTING_LIMIT = 10000
 CONTAINER_LISTING_LIMIT = 10000
 FILE_SIZE_LIMIT = 5368709122
-

=== modified file 'swift/common/auth.py'
--- swift/common/auth.py	2010-07-19 16:25:18 +0000
+++ swift/common/auth.py	2010-07-26 15:23:43 +0000
@@ -29,6 +29,7 @@
     """
     Auth Middleware that uses the dev auth server
     """
+
     def __init__(self, app, conf, memcache_client, logger):
         self.app = app
         self.memcache_client = memcache_client

=== modified file 'swift/common/bufferedhttp.py'
--- swift/common/bufferedhttp.py	2010-07-08 01:37:44 +0000
+++ swift/common/bufferedhttp.py	2010-07-26 15:23:43 +0000
@@ -133,6 +133,7 @@
     conn.endheaders()
     return conn
 
+
 def http_connect_raw(ipaddr, port, method, path, headers=None,
                      query_string=None):
     """

=== modified file 'swift/common/client.py'
--- swift/common/client.py	2010-07-25 01:03:56 +0000
+++ swift/common/client.py	2010-07-26 15:23:43 +0000
@@ -150,7 +150,7 @@
     :param url: authentication URL
     :param user: user to auth as
     :param key: key or passowrd for auth
-    :param snet: use SERVICENET internal network default is False 
+    :param snet: use SERVICENET internal network default is False
     :returns: tuple of (storage URL, storage token, auth token)
     :raises ClientException: HTTP GET request to auth URL failed
     """
@@ -166,7 +166,7 @@
     url = resp.getheader('x-storage-url')
     if snet:
         parsed = list(urlparse(url))
-        # Second item in the list is the netloc 
+        # Second item in the list is the netloc
         parsed[1] = 'snet-' + parsed[1]
         url = urlunparse(parsed)
     return url, resp.getheader('x-storage-token',
@@ -611,7 +611,7 @@
         :param preauthurl: storage URL (if you have already authenticated)
         :param preauthtoken: authentication token (if you have already
                              authenticated)
-        :param snet: use SERVICENET internal network default is False 
+        :param snet: use SERVICENET internal network default is False
         """
         self.authurl = authurl
         self.user = user
@@ -632,7 +632,8 @@
             try:
                 if not self.url or not self.token:
                     self.url, self.token = \
-                        get_auth(self.authurl, self.user, self.key, snet=self.snet)
+                        get_auth(self.authurl, self.user, self.key,
+                                 snet=self.snet)
                     self.http_conn = None
                 if not self.http_conn:
                     self.http_conn = http_connection(self.url)

=== modified file 'swift/common/db.py'
--- swift/common/db.py	2010-07-08 01:37:44 +0000
+++ swift/common/db.py	2010-07-26 15:23:43 +0000
@@ -47,6 +47,7 @@
 
 class DatabaseConnectionError(sqlite3.DatabaseError):
     """More friendly error messages for DB Errors."""
+
     def __init__(self, path, msg, timeout=0):
         self.path = path
         self.timeout = timeout
@@ -59,6 +60,7 @@
 
 class GreenDBConnection(sqlite3.Connection):
     """SQLite DB Connection handler that plays well with eventlet."""
+
     def __init__(self, *args, **kwargs):
         self.timeout = kwargs.get('timeout', BROKER_TIMEOUT)
         kwargs['timeout'] = 0

=== modified file 'swift/common/db_replicator.py'
--- swift/common/db_replicator.py	2010-07-25 01:03:56 +0000
+++ swift/common/db_replicator.py	2010-07-26 15:23:43 +0000
@@ -55,6 +55,7 @@
     """
     Helper to simplify POSTing to a remote server.
     """
+
     def __init__(self, node, partition, hash_, logger):
         ""
         self.logger = logger
@@ -92,7 +93,7 @@
         self.logger = \
             get_logger(replicator_conf, '%s-replicator' % self.server_type)
         # log uncaught exceptions
-        sys.excepthook = lambda *exc_info: \
+        sys.excepthook = lambda * exc_info: \
                 self.logger.critical('UNCAUGHT EXCEPTION', exc_info=exc_info)
         sys.stdout = sys.stderr = LoggerFileObject(self.logger)
         self.root = server_conf.get('devices', '/srv/node')
@@ -376,6 +377,7 @@
 
         :param datadirs: a list of paths to walk
         """
+
         def walk_datadir(datadir, node_id):
             partitions = os.listdir(datadir)
             random.shuffle(partitions)

=== modified file 'swift/common/exceptions.py'
--- swift/common/exceptions.py	2010-07-08 01:37:44 +0000
+++ swift/common/exceptions.py	2010-07-26 15:23:43 +0000
@@ -26,10 +26,29 @@
         return '%s: %s' % (TimeoutError.__str__(self), self.msg)
 
 
-class AuditException(Exception): pass
-class AuthException(Exception): pass
-class ChunkReadTimeout(TimeoutError): pass
-class ChunkWriteTimeout(TimeoutError): pass
-class ConnectionTimeout(TimeoutError): pass
-class DriveNotMounted(Exception): pass
-class LockTimeout(MessageTimeout): pass
+class AuditException(Exception):
+    pass
+
+
+class AuthException(Exception):
+    pass
+
+
+class ChunkReadTimeout(TimeoutError):
+    pass
+
+
+class ChunkWriteTimeout(TimeoutError):
+    pass
+
+
+class ConnectionTimeout(TimeoutError):
+    pass
+
+
+class DriveNotMounted(Exception):
+    pass
+
+
+class LockTimeout(MessageTimeout):
+    pass

=== modified file 'swift/common/healthcheck.py'
--- swift/common/healthcheck.py	2010-07-08 01:37:44 +0000
+++ swift/common/healthcheck.py	2010-07-26 15:23:43 +0000
@@ -15,6 +15,7 @@
 
 from webob import Response
 
+
 class HealthCheckController(object):
     """Basic controller used for monitoring."""
 

=== modified file 'swift/common/ring/ring.py'
--- swift/common/ring/ring.py	2010-07-19 16:25:18 +0000
+++ swift/common/ring/ring.py	2010-07-26 15:23:43 +0000
@@ -24,6 +24,7 @@
 
 class RingData(object):
     """Partitioned consistent hashing ring data (used for serialization)."""
+
     def __init__(self, replica2part2dev_id, devs, part_shift):
         self.devs = devs
         self._replica2part2dev_id = replica2part2dev_id
@@ -37,6 +38,7 @@
     :param pickle_gz_path: path to ring file
     :param reload_time: time interval in seconds to check for a ring change
     """
+
     def __init__(self, pickle_gz_path, reload_time=15):
         self.pickle_gz_path = pickle_gz_path
         self.reload_time = reload_time

=== modified file 'swift/common/utils.py'
--- swift/common/utils.py	2010-07-08 01:37:44 +0000
+++ swift/common/utils.py	2010-07-26 15:23:43 +0000
@@ -98,7 +98,8 @@
     :param length: length
     """
     # 4 means "POSIX_FADV_DONTNEED"
-    ret = posix_fadvise(fd, ctypes.c_uint64(offset), ctypes.c_uint64(length), 4)
+    ret = posix_fadvise(fd, ctypes.c_uint64(offset),
+                        ctypes.c_uint64(length), 4)
     if ret != 0:
         print "posix_fadvise(%s, %s, %s, 4) -> %s" % (fd, offset, length, ret)
 
@@ -262,6 +263,7 @@
                     self._proxy(getattr(logger, proxied_method)))
 
     def _proxy(self, logger_meth):
+
         def _inner_proxy(msg, *args, **kwargs):
             msg = '%s %s' % (self.server, msg)
             logger_meth(msg, *args, **kwargs)

=== modified file 'swift/common/wsgi.py'
--- swift/common/wsgi.py	2010-07-08 01:37:44 +0000
+++ swift/common/wsgi.py	2010-07-26 15:23:43 +0000
@@ -35,6 +35,7 @@
 from swift.common.utils import get_logger, drop_privileges, \
     LoggerFileObject, NullLogger
 
+
 def monkey_patch_mimetools():
     """
     mimetools.Message defaults content-type to "text/plain"
@@ -56,6 +57,8 @@
 
 # We might be able to pull pieces of this out to test, but right now it seems
 # like more work than it's worth.
+
+
 def run_wsgi(app, conf, *args, **kwargs):   # pragma: no cover
     """
     Loads common settings from conf, then instantiates app and runs
@@ -68,8 +71,9 @@
         logger = kwargs['logger']
     else:
         logger = get_logger(conf, app.log_name)
+
     # log uncaught exceptions
-    sys.excepthook = lambda *exc_info: \
+    sys.excepthook = lambda * exc_info: \
         logger.critical('UNCAUGHT EXCEPTION', exc_info=exc_info)
     sys.stdout = sys.stderr = LoggerFileObject(logger)
 

=== modified file 'swift/obj/replicator.py'
--- swift/obj/replicator.py	2010-07-19 16:25:18 +0000
+++ swift/obj/replicator.py	2010-07-26 15:23:43 +0000
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os, sys
+import os
+import sys
 from os.path import isdir, join
 from ConfigParser import ConfigParser
 import random
@@ -41,6 +42,7 @@
 ONE_WEEK = 604800
 HASH_FILE = 'hashes.pkl'
 
+
 def hash_suffix(path, reclaim_age):
     """
     Performs reclamation and returns an md5 of all (remaining) files.
@@ -94,6 +96,7 @@
     :param suffixes: list of suffixes to recalculate
     :param reclaim_age: age in seconds at which tombstones should be removed
     """
+
     def tpool_listdir(partition_dir):
         return dict(((suff, None) for suff in os.listdir(partition_dir)
                      if len(suff) == 3 and isdir(join(partition_dir, suff))))
@@ -119,8 +122,10 @@
     """
     Invalidates the hash for a suffix_dir in the partition's hashes file.
 
-    :param suffix_dir: absolute path to suffix dir whose hash needs invalidating
+    :param suffix_dir: absolute path to suffix dir whose hash needs
+    invalidating
     """
+
     suffix = os.path.basename(suffix_dir)
     partition_dir = os.path.dirname(suffix_dir)
     hashes_file = join(partition_dir, HASH_FILE)
@@ -150,6 +155,7 @@
 
     :returns: tuple of (number of suffix dirs hashed, dictionary of hashes)
     """
+
     def tpool_listdir(hashes, partition_dir):
         return dict(((suff, hashes.get(suff, None))
                      for suff in os.listdir(partition_dir)
@@ -230,8 +236,8 @@
         ret_val = None
         try:
             with Timeout(120):
-                proc = subprocess.Popen(args, stdout = subprocess.PIPE,
-                    stderr = subprocess.STDOUT)
+                proc = subprocess.Popen(args, stdout=subprocess.PIPE,
+                    stderr=subprocess.STDOUT)
                 results = proc.stdout.read()
                 ret_val = proc.wait()
         finally:
@@ -311,11 +317,12 @@
 
     def update_deleted(self, job):
         """
-        High-level method that replicates a single partition that doesn't belong
-        on this node.
+        High-level method that replicates a single partition that doesn't
+        belong on this node.
 
         :param job: a dict containing info about the partition to be replicated
         """
+
         def tpool_get_suffixes(path):
             return [suff for suff in os.listdir(path)
                     if len(suff) == 3 and isdir(join(path, suff))]
@@ -329,11 +336,11 @@
                     success = self.rsync(node, job, suffixes)
                     if success:
                         with Timeout(60):
-                            http_connect(node['ip'], node['port'],
+                            http_connect(node['ip'],
+                                node['port'],
                                 node['device'], job['partition'], 'REPLICATE',
                                 '/' + '-'.join(suffixes),
-                                headers={'Content-Length': '0'}
-                            ).getresponse().read()
+                          headers={'Content-Length': '0'}).getresponse().read()
                     responses.append(success)
             if not suffixes or (len(responses) == REPLICAS and all(responses)):
                 self.logger.info("Removing partition: %s" % job['path'])
@@ -365,8 +372,7 @@
                     with Timeout(60):
                         resp = http_connect(node['ip'], node['port'],
                                 node['device'], job['partition'], 'REPLICATE',
-                                '', headers={'Content-Length': '0'}
-                        ).getresponse()
+                            '', headers={'Content-Length': '0'}).getresponse()
                         if resp.status != 200:
                             self.logger.error("Invalid response %s from %s" %
                                     (resp.status, node['ip']))
@@ -375,18 +381,19 @@
                         del resp
                     successes += 1
                     suffixes = [suffix for suffix in local_hash
-                           if local_hash[suffix] != remote_hash.get(suffix, -1)]
+                                  if local_hash[suffix] !=
+                                     remote_hash.get(suffix, -1)]
                     if not suffixes:
                         continue
                     success = self.rsync(node, job, suffixes)
                     recalculate_hashes(job['path'], suffixes,
                                        reclaim_age=self.reclaim_age)
                     with Timeout(60):
-                        http_connect(node['ip'], node['port'],
+                        conn = http_connect(node['ip'], node['port'],
                             node['device'], job['partition'], 'REPLICATE',
                             '/' + '-'.join(suffixes),
-                            headers={'Content-Length': '0'}
-                        ).getresponse().read()
+                            headers={'Content-Length': '0'})
+                        conn.getresponse().read()
                     self.suffix_sync += len(suffixes)
                 except (Exception, Timeout):
                     logging.exception("Error syncing with node: %s" % node)
@@ -403,22 +410,27 @@
         if self.replication_count:
             rate = self.replication_count / (time.time() - self.start)
             left = int((self.job_count - self.replication_count) / rate)
-            self.logger.info("%d/%d (%.2f%%) partitions replicated in %.2f seconds (%.2f/sec, %s remaining)"
+            self.logger.info("%d/%d (%.2f%%) partitions replicated in %.2f "
+                             "seconds (%.2f/sec, %s remaining)"
                     % (self.replication_count, self.job_count,
                        self.replication_count * 100.0 / self.job_count,
                        time.time() - self.start, rate,
-                       '%d%s' % compute_eta(self.start, self.replication_count, self.job_count)))
+                       '%d%s' % compute_eta(self.start,
+                           self.replication_count, self.job_count)))
             if self.suffix_count:
-                self.logger.info("%d suffixes checked - %.2f%% hashed, %.2f%% synced" %
+                self.logger.info("%d suffixes checked - %.2f%% hashed, "
+                                 "%.2f%% synced" %
                     (self.suffix_count,
                      (self.suffix_hash * 100.0) / self.suffix_count,
                      (self.suffix_sync * 100.0) / self.suffix_count))
                 self.partition_times.sort()
-                self.logger.info("Partition times: max %.4fs, min %.4fs, med %.4fs"
+                self.logger.info("Partition times: max %.4fs, min %.4fs, "
+                                 "med %.4fs"
                     % (self.partition_times[-1], self.partition_times[0],
                        self.partition_times[len(self.partition_times) // 2]))
         else:
-            self.logger.info("Nothing replicated for %s seconds." % (time.time() - self.start))
+            self.logger.info("Nothing replicated for %s seconds."
+                % (time.time() - self.start))
 
     def kill_coros(self):
         """Utility function that kills all coroutines currently running."""
@@ -457,9 +469,8 @@
             ips = whataremyips()
             self.run_pool = GreenPool(size=self.concurrency)
             for local_dev in [
-                dev for dev in self.object_ring.devs
-                if dev and dev['ip'] in ips and dev['port'] == self.port
-            ]:
+                    dev for dev in self.object_ring.devs
+                    if dev and dev['ip'] in ips and dev['port'] == self.port]:
                 dev_path = join(self.devices_dir, local_dev['device'])
                 obj_path = join(dev_path, 'objects')
                 tmp_path = join(dev_path, 'tmp')
@@ -472,7 +483,7 @@
                 for partition in os.listdir(obj_path):
                     try:
                         nodes = [node for node in
-                                 self.object_ring.get_part_nodes(int(partition))
+                            self.object_ring.get_part_nodes(int(partition))
                                  if node['id'] != local_dev['id']]
                         jobs.append(dict(path=join(obj_path, partition),
                             nodes=nodes, delete=len(nodes) > 2,

=== modified file 'swift/obj/server.py'
--- swift/obj/server.py	2010-07-19 16:25:18 +0000
+++ swift/obj/server.py	2010-07-26 15:23:43 +0000
@@ -88,6 +88,7 @@
     :param keep_data_fp: if True, don't close the fp, otherwise close it
     :param disk_chunk_Size: size of chunks on file reads
     """
+
     def __init__(self, path, device, partition, account, container, obj,
                     keep_data_fp=False, disk_chunk_size=65536):
         self.disk_chunk_size = disk_chunk_size

=== modified file 'swift/proxy/server.py'
--- swift/proxy/server.py	2010-07-19 19:31:58 +0000
+++ swift/proxy/server.py	2010-07-26 15:23:43 +0000
@@ -563,7 +563,7 @@
             source_header = '/' + acct + source_header
             try:
                 src_container_name, src_obj_name = \
-                    source_header.split('/',3)[2:]
+                    source_header.split('/', 3)[2:]
             except ValueError:
                 return HTTPPreconditionFailed(request=req,
                     body='X-Copy-From header must be of the form'
@@ -755,7 +755,8 @@
             _, dest_container, dest_object = dest.split('/', 3)
         except ValueError:
             return HTTPPreconditionFailed(request=req,
-                    body='Destination header must be of the form container/object')
+                    body='Destination header must be of the form '
+                         'container/object')
         new_source = '/' + self.container_name + '/' + self.object_name
         self.container_name = dest_container
         self.object_name = dest_object