← Back to branch summary

~ubuntuone-control-tower/ubuntu-sso-client/trunk

« back to all changes in this revision

Viewing changes to ubuntu_sso/utils/webclient/qtnetwork.py

  • Committer: Tarmac
  • Author(s): Manuel de la Pena
  • Date: 2012-04-17 14:23:57 UTC
  • mfrom: (943.1.1 remove-duplication)
  • Revision ID: tarmac-20120417142357-4ljl7stfxcr52aaw
- Removed duplicated code from the different webclient implementations (LP: #904842).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntu_sso/utils/webclient/qtnetwork.py
155
155
        """Return a deferred that will be fired with a Response object."""
156
156
        uri = self.iri_to_uri(iri)
157
157
        request = QNetworkRequest(QUrl(uri))
158
 
 
159
 
        if extra_headers:
160
 
            headers = dict(extra_headers)
161
 
        else:
162
 
            headers = {}
163
 
 
164
 
        if oauth_credentials:
165
 
            timestamp = yield self.get_timestamp()
166
 
            oauth_headers = self.build_oauth_headers(method, uri,
167
 
                                                oauth_credentials, timestamp)
168
 
            headers.update(oauth_headers)
 
158
        headers = yield self.build_request_headers(uri, method, extra_headers,
 
159
                                                   oauth_credentials)
169
160
 
170
161
        for key, value in headers.iteritems():
171
162
            request.setRawHeader(key, value)