Merge pull request #39 from ssmssam/quick_start_fixes

Quick start fixes

Author: JackKelly

pvoutput/consts.py

@@ -1,9 +1,9 @@
 import os
 from datetime import timedelta
-
+from urllib.parse import urljoin
 
 BASE_URL = 'https://pvoutput.org'
-MAP_URL = os.path.join(BASE_URL, 'map.jsp')
+MAP_URL = urljoin(BASE_URL, 'map.jsp')
 
 # Country codes used by PVOutput.org on, for example,
 # https://pvoutput.org/map.jsp.  Taken from

pvoutput/pvoutput.py

@@ -9,6 +9,7 @@
 import tables
 import numpy as np
 import pandas as pd
+from urllib.parse import urljoin
 
 from pvoutput.exceptions import NoStatusFound, RateLimitExceeded
 from pvoutput.utils import _get_response, _get_param_from_config_file
@@ -85,6 +86,8 @@ def __init__(self,
                     'data_service_url', config_filename)
             except KeyError:
                 pass
+            except FileNotFoundError:
+                pass
 
         if self.data_service_url is not None:
             if not self.data_service_url.strip('/').endswith('.org'):
@@ -816,8 +819,7 @@ def _get_api_response(self,
             'X-Pvoutput-Apikey': self.api_key,
             'X-Pvoutput-SystemId': self.system_id}
 
-        api_url = os.path.join(
-            BASE_URL, 'service/r2/{}.jsp'.format(service))
+        api_url = urljoin(BASE_URL, 'service/r2/{}.jsp'.format(service))
 
         return _get_response(api_url, api_params, headers)
 
@@ -840,7 +842,7 @@ def _get_data_service_response(self,
         api_params['key'] = self.api_key
         api_params['sid'] = self.system_id
 
-        api_url = os.path.join(
+        api_url = urljoin(
             self.data_service_url, 'service/r2/{}.jsp'.format(service))
 
         return _get_response(api_url, api_params, headers)

pvoutput/tests/test_pvoutput.py

@@ -8,15 +8,13 @@ def test_convert_consecutive_dates_to_date_ranges():
     missing_dates = dr1 + dr2
     date_ranges = pvoutput._convert_consecutive_dates_to_date_ranges(
         missing_dates)
-
+    columns = ['missing_start_date_PV_localtime',
+               'missing_end_date_PV_localtime']
     pd.testing.assert_frame_equal(
-        date_ranges,
+        date_ranges[columns],
         pd.DataFrame(
             [
                 [dr1[0], dr1[-1]],
                 [dr2[0], dr2[-1]],
             ],
-            columns=[
-                'missing_start_date_PV_localtime',
-                'missing_end_date_PV_localtime'
-            ]))
+            columns=columns))