diff options
| author | Idan Gazit <idan@gazit.me> | 2012-04-29 13:59:39 +0300 |
|---|---|---|
| committer | Idan Gazit <idan@gazit.me> | 2012-04-29 13:59:39 +0300 |
| commit | 68896d81b70ed09d47d31c96bf0afa074af587db (patch) | |
| tree | cb7f8e3e582016b1ce7b738042ea042418ac4d81 /oauthlib | |
| parent | 9c66fc2a13ab0cb442ef1b340295e05c85b6b78a (diff) | |
| download | oauthlib-68896d81b70ed09d47d31c96bf0afa074af587db.tar.gz | |
More string format fixes for python 2.6
Diffstat (limited to 'oauthlib')
| -rw-r--r-- | oauthlib/oauth1/rfc5849/__init__.py | 8 | ||||
| -rw-r--r-- | oauthlib/oauth2/draft25/tokens.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/oauthlib/oauth1/rfc5849/__init__.py b/oauthlib/oauth1/rfc5849/__init__.py index b10ff9c..cc8c8f3 100644 --- a/oauthlib/oauth1/rfc5849/__init__.py +++ b/oauthlib/oauth1/rfc5849/__init__.py @@ -65,17 +65,17 @@ class Client(object): uri_query=urlparse.urlparse(uri).query, body=body, headers=headers) - logging.debug("Collected params: {}".format(collected_params)) + logging.debug("Collected params: {0}".format(collected_params)) normalized_params = signature.normalize_parameters(collected_params) normalized_uri = signature.normalize_base_string_uri(request.uri) - logging.debug("Normalized params: {}".format(normalized_params)) - logging.debug("Normalized URI: {}".format(normalized_uri)) + logging.debug("Normalized params: {0}".format(normalized_params)) + logging.debug("Normalized URI: {0}".format(normalized_uri)) base_string = signature.construct_base_string(request.http_method, normalized_uri, normalized_params) - logging.debug("Base signing string: {}".format(base_string)) + logging.debug("Base signing string: {0}".format(base_string)) if self.signature_method == SIGNATURE_HMAC: return signature.sign_hmac_sha1(base_string, self.client_secret, diff --git a/oauthlib/oauth2/draft25/tokens.py b/oauthlib/oauth2/draft25/tokens.py index 3af79dd..9b5f586 100644 --- a/oauthlib/oauth2/draft25/tokens.py +++ b/oauthlib/oauth2/draft25/tokens.py @@ -52,7 +52,7 @@ def prepare_mac_header(token, uri, key, http_method, nonce=None, headers=None, else: h = hashlib.sha256 - nonce = nonce or u'{}:{}'.format(utils.generate_nonce(), utils.generate_timestamp()) + nonce = nonce or u'{0}:{1}'.format(utils.generate_nonce(), utils.generate_timestamp()) sch, net, path, par, query, fra = urlparse(uri) if query: |