Fixed api_key_required decorator to be useable on instance methods. Changed urllib(2) code to use requests package. Added requirements.txt to store required packages. Added requests package to the requirements.txt

Author: satoon101

requirements/requirements.txt

@@ -0,0 +1,4 @@
+# https://pypi.python.org/pypi/requests
+# http://www.python-requests.org/en/latest/user/install/
+# -i http://simple.crate.io/ requests
+requests

steamwebapi/core.py

@@ -10,9 +10,13 @@
 # >> IMPORTS
 # =============================================================================
 # Python Imports
-import urllib
-import urllib2
+#import urllib
+#import urllib2
 import re
+#   Requests
+from requests import get as requests_get
+from requests import post as requests_post
+from requests.compat import urlencode
 
 # API Imports
 from .settings import STEAM_API_KEY, DEFAULT_LANGUAGE
@@ -134,7 +138,8 @@ def _encode_url(self):
             self._interface,
             self._method,
             self._version,
-            urllib.urlencode(self._parameters)
+            # urllib.urlencode(self._parameters)
+            urlencode(self._parameters)
         )
 
     @property
@@ -245,9 +250,12 @@ def as_vdf(self):
     def _execute_query(self):
         # GET
         if self.httpmethod == 'GET':
-            return urllib2.urlopen(self._url)
+            # return urllib2.urlopen(self._url)
+            return requests_get(self._url)
 
         # POST
-        data = urllib.urlencode(self.parameters)
-        req = urllib2.Request(self._url, data)
-        return urllib2.urlopen(req)
+        # data = urllib.urlencode(self.parameters)
+        data = urlencode(self.parameters)
+        # req = urllib2.Request(self._url, data)
+        # return urllib2.urlopen(req)
+        return requests_post(self._url, data)

steamwebapi/user.py

@@ -3,7 +3,7 @@
 # =============================================================================
 # Python Imports
 import re
-from urllib2 import HTTPError
+from requests import HTTPError
 
 # API Imports
 from .core import SteamWebAPI

steamwebapi/util/decorators.py

@@ -29,8 +29,26 @@ def public(f):
 public(public)  # Emulate decorating ourself (make public)
 
 
-def api_key_required(f):
-    def decorator(self, *args, **kwargs):
-        if not self.key:
+class api_key_required(object):
+    """
+    """
+
+    def __init__(self, method):
+        '''Store the method instance for further use'''
+        self.method = method
+
+    def __get__(self, instance, owner):
+        '''Return the class value instead of the methods directly'''
+        return self.__class__(self.method.__get__(instance, owner))
+
+    def __call__(self, *args, **kwargs):
+        '''Verifies that the key exists prior to calling the method'''
+
+        # Does the class have an API key
+        if not self.method.__self__.key:
+
+            # Raise an error if no key is provided
             raise APIKeyRequiredError
-    return decorator
+
+        # Call the method and return
+        return self.method(*args, **kwargs)