Merge branch 'release/2.0.0'

README.md

@@ -12,6 +12,7 @@ Alpha Vantage delivers a free API for real time financial data and most used fin
 Vantage (http://www.alphavantage.co/). It requires a free API, that can be requested on http://www.alphavantage.co/support/#api-key. You can have a look at all the api calls available in their documentation http://www.alphavantage.co/documentation
 
 ## News
+
 * From version 1.9.0 onwards, the urllib was substituted by pythons request library that is thread safe. If you have any error, post an issue.
 * From version 1.8.0 onwards, the column names of the data frames have changed, they are now exactly what alphavantage gives back in their json response. You can see the examples in better detail in the following git repo:  https://github.com/RomelTorres/av_example
 * From version 1.6.0, pandas was taken out as a hard dependency.

alpha_vantage/alphavantage.py

@@ -28,7 +28,7 @@ class AlphaVantage(object):
         "https://www.alphavantage.co/digital_currency_list/"
 
     def __init__(self, key=None, retries=5, output_format='json',
-                 treat_info_as_error=True, indexing_type='date'):
+                 treat_info_as_error=True, indexing_type='date', proxy={}):
         """ Initialize the class
 
         Keyword Arguments:
@@ -58,6 +58,7 @@ def __init__(self, key=None, retries=5, output_format='json',
         # variable will be overriden by those functions not needing it.
         self._append_type = True
         self.indexing_type = indexing_type
+        self.proxy = proxy
 
     def _retry(func):
         """ Decorator for retrying api calls (in case of errors from the api
@@ -214,6 +215,9 @@ def _format_wrapper(self, *args, **kwargs):
                     self.output_format))
         return _format_wrapper
 
+    def set_proxy(self, proxy={}):
+        self.proxy = proxy
+
     def map_to_matype(self, matype):
         """ Convert to the alpha vantage math type integer. It returns an
         integer correspondant to the type of math to apply to a function. It
@@ -254,7 +258,7 @@ def _handle_api_call(self, url):
             meta_data_key:  The key for getting the meta data information out
             of the json object
         """
-        response = requests.get(url)
+        response = requests.get(url, proxies=self.proxy)
         if 'json' in self.output_format.lower() or 'pandas' in \
                 self.output_format.lower():
             json_response = response.json()

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='alpha_vantage',
-    version='1.9.0',
+    version='2.0.0',
     author='Romel J. Torres',
     author_email='[email protected]',
     license='MIT',
@@ -30,6 +30,7 @@
     url='https://github.com/RomelTorres/alpha_vantage',
     install_requires=[
         'requests',
+        'simplejson'
     ],
     test_requires=[
         'nose',