Skip to content

Commit d4e30ad

Browse files
committed
fix pyflakes
1 parent 3272c3d commit d4e30ad

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

oauth2/__init__.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@
3030
import binascii
3131
import httplib2
3232

33+
from urlparse import parse_qs, parse_qsl
34+
3335
try:
34-
from urlparse import parse_qs, parse_qsl
36+
from hashlib import sha1
37+
sha = sha1
3538
except ImportError:
36-
from cgi import parse_qs, parse_qsl
37-
39+
# hashlib was added in Python 2.5
40+
import sha
3841

3942
import _version
4043

@@ -602,7 +605,6 @@ def add_signature_method(self, signature_method):
602605
def verify_request(self, request, consumer, token):
603606
"""Verifies an api call and checks all the parameters."""
604607

605-
version = self._get_version(request)
606608
self._check_signature(request, consumer, token)
607609
parameters = request.get_nonoauth_parameters()
608610
return parameters
@@ -661,7 +663,7 @@ def _check_signature(self, request, consumer, token):
661663
raise Error('Invalid signature. Expected signature base '
662664
'string: %s' % base)
663665

664-
built = signature_method.sign(request, consumer, token)
666+
signature_method.sign(request, consumer, token)
665667

666668
def _check_timestamp(self, timestamp):
667669
"""Verify that timestamp is recentish."""
@@ -733,12 +735,6 @@ def sign(self, request, consumer, token):
733735
"""Builds the base signature string."""
734736
key, raw = self.signing_base(request, consumer, token)
735737

736-
# HMAC object.
737-
try:
738-
from hashlib import sha1 as sha
739-
except ImportError:
740-
import sha # Deprecated
741-
742738
hashed = hmac.new(key, raw, sha)
743739

744740
# Calculate the digest base 64.

0 commit comments

Comments
 (0)