From 3465d639e312ad112b3d239f7e18590cff792ec8 Mon Sep 17 00:00:00 2001 From: zhufl Date: Mon, 19 Nov 2018 15:22:59 +0800 Subject: [PATCH] Add missing ws seperator between words This is to add missing ws seperator between words, usually in log messages. Change-Id: I6b88fab428b93def77632f9aed29fc2de4380b0d --- swift/container/backend.py | 2 +- swift/container/sharder.py | 2 +- swift/obj/diskfile.py | 2 +- swift/obj/reconstructor.py | 2 +- test/functional/__init__.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/swift/container/backend.py b/swift/container/backend.py index 891b2a3988..6cb1321d4a 100644 --- a/swift/container/backend.py +++ b/swift/container/backend.py @@ -1310,7 +1310,7 @@ class ContainerBroker(DatabaseBroker): if to_add: curs.executemany( 'INSERT INTO object (name, created_at, size, content_type,' - 'etag, deleted, storage_policy_index)' + 'etag, deleted, storage_policy_index) ' 'VALUES (?, ?, ?, ?, ?, ?, ?)', ((rec['name'], rec['created_at'], rec['size'], rec['content_type'], rec['etag'], rec['deleted'], diff --git a/swift/container/sharder.py b/swift/container/sharder.py index ae266736a5..34c8d82b06 100644 --- a/swift/container/sharder.py +++ b/swift/container/sharder.py @@ -603,7 +603,7 @@ class ContainerSharder(ContainerReplicator): node = self.find_local_handoff_for_part(part) if not node: raise DeviceUnavailable( - 'No mounted devices found suitable for creating shard broker' + 'No mounted devices found suitable for creating shard broker ' 'for %s in partition %s' % (shard_range.name, part)) shard_broker = ContainerBroker.create_broker( diff --git a/swift/obj/diskfile.py b/swift/obj/diskfile.py index ff0b71d001..610c5e052a 100644 --- a/swift/obj/diskfile.py +++ b/swift/obj/diskfile.py @@ -2925,7 +2925,7 @@ class ECDiskFileReader(BaseDiskFileReader): # format so for safety, check the input chunk if it's binary to # avoid quarantining a valid fragment archive. self._diskfile._logger.warn( - _('Unexpected fragment data type (not quarantined)' + _('Unexpected fragment data type (not quarantined) ' '%(datadir)s: %(type)s at offset 0x%(offset)x'), {'datadir': self._diskfile._datadir, 'type': type(frag), diff --git a/swift/obj/reconstructor.py b/swift/obj/reconstructor.py index 10143f5e74..04c58e991b 100644 --- a/swift/obj/reconstructor.py +++ b/swift/obj/reconstructor.py @@ -1195,7 +1195,7 @@ class ObjectReconstructor(Daemon): with Timeout(self.lockup_timeout): self.run_pool.waitall() except (Exception, Timeout): - self.logger.exception(_("Exception in top-level" + self.logger.exception(_("Exception in top-level " "reconstruction loop")) self.kill_coros() finally: diff --git a/test/functional/__init__.py b/test/functional/__init__.py index 02e30e5308..aaa77d72ae 100644 --- a/test/functional/__init__.py +++ b/test/functional/__init__.py @@ -943,7 +943,7 @@ def setup_package(): global skip3 skip3 = not all([not skip, swift_test_user[2], swift_test_key[2]]) if not skip and skip3: - print('SKIPPING THIRD ACCOUNT FUNCTIONAL TESTS' + print('SKIPPING THIRD ACCOUNT FUNCTIONAL TESTS ' 'DUE TO NO CONFIG FOR THEM', file=sys.stderr) global skip_if_not_v3