Fix bug inserted by pyflakes inspired cleanup earlier -- it turns out that _get_version() wasn't dead code but was having a necessary side-effect. Add new method named _check_version() to be clearer about what it does compared to _get_version()

Author: zookos

oauth2/__init__.py

@@ -605,6 +605,7 @@ def add_signature_method(self, signature_method):
     def verify_request(self, request, consumer, token):
         """Verifies an api call and checks all the parameters."""
 
+        self._check_version(request)
         self._check_signature(request, consumer, token)
         parameters = request.get_nonoauth_parameters()
         return parameters
@@ -613,16 +614,19 @@ def build_authenticate_header(self, realm=''):
         """Optional support for the authenticate header."""
         return {'WWW-Authenticate': 'OAuth realm="%s"' % realm}
 
+    def _check_version(self, request):
+        """Verify the correct version of the request for this server."""
+        version = self._get_version(request)
+        if version and version != self.version:
+            raise Error('OAuth version %s not supported.' % str(version))
+
     def _get_version(self, request):
-        """Verify the correct version request for this server."""
+        """Return the version of the request for this server."""
         try:
             version = request.get_parameter('oauth_version')
         except:
             version = OAUTH_VERSION
 
-        if version and version != self.version:
-            raise Error('OAuth version %s not supported.' % str(version))
-
         return version
 
     def _get_signature_method(self, request):