← Back to branch summary

~ubuntu-branches/ubuntu/trusty/python-keystoneclient/trusty-proposed

« back to all changes in this revision

Viewing changes to keystoneclient/generic/client.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-01-18 07:44:54 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20130118074454-g7w5blpynohn1s48
Tags: 1:0.2.2-0ubuntu1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
keystoneclient/generic/client.py
84
84
            resp, body = httpclient.request(url, "GET",
85
85
                                            headers={'Accept':
86
86
                                                     'application/json'})
87
 
            if resp.status in (200, 204):  # in some cases we get No Content
 
87
            if resp.status_code in (200, 204):  # some cases we get No Content
88
88
                try:
89
89
                    results = {}
90
90
                    if 'version' in body:
113
113
                    return results
114
114
                except KeyError:
115
115
                    raise exceptions.AuthorizationFailure()
116
 
            elif resp.status == 305:
 
116
            elif resp.status_code == 305:
117
117
                return self._check_keystone_versions(resp['location'])
118
118
            else:
119
 
                raise exceptions.from_response(resp, body)
 
119
                raise exceptions.from_response(resp, resp.text)
120
120
        except Exception as e:
121
121
            _logger.exception(e)
122
122
 
145
145
            resp, body = httpclient.request("%sextensions" % url, "GET",
146
146
                                            headers={'Accept':
147
147
                                                     'application/json'})
148
 
            if resp.status in (200, 204):  # in some cases we get No Content
 
148
            if resp.status_code in (200, 204):  # some cases we get No Content
149
149
                try:
150
150
                    results = {}
151
151
                    if 'extensions' in body:
171
171
                    return results
172
172
                except KeyError:
173
173
                    raise exceptions.AuthorizationFailure()
174
 
            elif resp.status == 305:
 
174
            elif resp.status_code == 305:
175
175
                return self._check_keystone_extensions(resp['location'])
176
176
            else:
177
 
                raise exceptions.from_response(resp, body)
 
177
                raise exceptions.from_response(resp, resp.text)
178
178
        except Exception as e:
179
179
            _logger.exception(e)
180
180