openstack/deb-keystone
Code Issues Proposed changes

Merge "remove a few backslash line continuations"

Browse Source
This commit is contained in:
Jenkins 2014-05-27 05:26:30 +00:00 committed by Gerrit Code Review
commit 7574d86036
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
keystone/common/cache/backends/mongo.py vendored
View File

@ -288,8 +288,8 @@ class MongoApi(object):
if ssl_ca_certs:
self.conn_kwargs['ssl_ca_certs'] = ssl_ca_certs
if ssl_cert_reqs:
self.conn_kwargs['ssl_cert_reqs'] = \
self._ssl_cert_req_type(ssl_cert_reqs)
self.conn_kwargs['ssl_cert_reqs'] = (
self._ssl_cert_req_type(ssl_cert_reqs))
# rest of arguments are passed to mongo crud calls
self.meth_kwargs = arguments
@ -360,8 +360,8 @@ class MongoApi(object):
self._assign_data_mainpulator()
if self.read_preference:
self.read_preference = pymongo.read_preferences.\
mongos_enum(self.read_preference)
self.read_preference = pymongo.read_preferences.mongos_enum(
self.read_preference)
coll.read_preference = self.read_preference
if self.w > -1:
coll.write_concern['w'] = self.w

4
keystone/common/serializer.py
View File

@ -101,8 +101,8 @@ class XmlDeserializer(object):
prefix = xmlns.get('prefix')
break
if prefix is not None:
return '%(PREFIX)s:%(tag_name)s' \
% {'PREFIX': prefix, 'tag_name': tag_name}
return '%(PREFIX)s:%(tag_name)s' % {
'PREFIX': prefix, 'tag_name': tag_name}
else:
return tag_name

3
keystone/common/sql/core.py
View File

@ -94,8 +94,7 @@ def initialize_decorator(init):
if isinstance(column.type, String):
if not isinstance(v, six.text_type):
v = six.text_type(v)
if column.type.length and \
column.type.length < len(v):
if column.type.length and column.type.length < len(v):
raise exception.StringLengthExceeded(
string=v, type=k, length=column.type.length)