Merge "Backslash continuation removal (Keystone folsom-1)"

keystone/identity/backends/ldap/core.py

@@ -321,7 +321,7 @@ class UserApi(common_ldap.BaseLdap, ApiShimMixin):
             self.role_api.rolegrant_delete(ref.id)
 
     def get_by_email(self, email):
-        users = self.get_all('(mail=%s)' % \
+        users = self.get_all('(mail=%s)' %
                              (ldap_filter.escape_filter_chars(email),))
         try:
             return users[0]

keystone/identity/backends/sql.py

@@ -177,7 +177,8 @@ class Identity(sql.Base, identity.Driver):
         session = self.get_session()
         user_refs = session.query(User)\
                            .join(UserTenantMembership)\
-                .filter(UserTenantMembership.tenant_id == tenant_id)\
+                           .filter(UserTenantMembership.tenant_id ==
+                                   tenant_id)\
                            .all()
         return [_filter_user(user_ref.to_dict()) for user_ref in user_refs]
 

keystone/middleware/s3_token.py

@@ -76,9 +76,10 @@ class S3Token(object):
         resp = webob.Response(content_type='text/xml')
         resp.status = error_table[code][0]
         resp.body = error_table[code][1]
-        resp.body = '<?xml version="1.0" encoding="UTF-8"?>\r\n<Error>\r\n  ' \
-            '<Code>%s</Code>\r\n  <Message>%s</Message>\r\n</Error>\r\n' \
-            % (code, error_table[code][1])
+        resp.body = ('<?xml version="1.0" encoding="UTF-8"?>\r\n'
+                     '<Error>\r\n  <Code>%s</Code>\r\n  '
+                     '<Message>%s</Message>\r\n</Error>\r\n' %
+                     (code, error_table[code][1]))
         return resp
 
     def _json_request(self, creds_json):