openstack/python-swiftclient
Code Issues Proposed changes

Merge "boolean logic cleanup in service.Swift[Copy|Post]Object"

Browse Source
This commit is contained in:
Jenkins 2016-08-25 22:47:41 +00:00 committed by Gerrit Code Review
commit 19cd127294
1 changed files with 4 additions and 5 deletions

9
swiftclient/service.py

@ -323,13 +323,12 @@ class SwiftPostObject(object):
specified separately for each individual object. specified separately for each individual object.
""" """
def __init__(self, object_name, options=None): def __init__(self, object_name, options=None):
if not isinstance(object_name, string_types) or not object_name: if not (isinstance(object_name, string_types) and object_name):
raise SwiftError( raise SwiftError(
"Object names must be specified as non-empty strings" "Object names must be specified as non-empty strings"
) )
else: self.object_name = object_name
self.object_name = object_name self.options = options
self.options = options
class SwiftCopyObject(object): class SwiftCopyObject(object):
@ -340,7 +339,7 @@ class SwiftCopyObject(object):
destination and fresh_metadata should be set in options destination and fresh_metadata should be set in options
""" """
def __init__(self, object_name, options=None): def __init__(self, object_name, options=None):
if not isinstance(object_name, string_types) or not object_name: if not (isinstance(object_name, string_types) and object_name):
raise SwiftError( raise SwiftError(
"Object names must be specified as non-empty strings" "Object names must be specified as non-empty strings"
) )