Ability to add path to config

thinkingserious · thinkingserious · commit 149a1d41ae63 · 2016-02-25T16:37:43.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.0] - 2016-02-25
+### Fixed
+- Config paths
+
 ## [1.0.2] - 2016-02-25
 ### Fixed
 - Config paths
diff --git a/python_http_client/config.py b/python_http_client/config.py
@@ -5,10 +5,12 @@ class Config(object):
     """Allow variables assigned in .env available using
        os.environ.get('VAR_NAME')"""
     def __init__(self, base_path=None):
-        if base_path:
+        if base_path == "test":
             base_path = os.path.join(os.path.dirname(__file__), os.pardir)
+        elif base_path:
+            base_path = base_path
         else:
-            base_path = os.path.abspath(os.path.dirname(__file__))
+            base_path = os.path.join(os.path.dirname(__file__), os.pardir)
         if os.path.exists(base_path + '/.env'):
             file = open(base_path + '/.env')
             for line in file:
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@ def getRequires():
     return deps
 
 base_url = 'https://github.com/sendgrid/'
-version = '1.0.2'
+version = '1.1.0'
 setup(
     name='python_http_client',
     version=version,
