Merge pull request #198 from r24mille/142_fix_nvenergyclient

Fixes NVEnergyClient

Author: ajdonnison

pyiso/nvenergy.py

@@ -8,7 +8,6 @@
 except ImportError:
     from urllib.error import HTTPError
 import pytz
-import calendar
 
 
 class NVEnergyClient(BaseClient):
@@ -97,16 +96,14 @@ def data_url(self, ts, mode=None):
             url_file = ts.strftime('tomorrow.htm')
             mode = 'tomorrow'
         elif mode == 'alternate':
-            url_file = ts.strftime('native_system_load_and_ties_Y_for_%m_%d_%Y_.html')
+            url_file = ts.strftime('native%%20system%%20load%%20and%%20ties_Y%m_%d_%Y.html')
             mode = 'recent'
         elif (ts.month == today.month and ts.year == today.year) or (today-this_day).days < 2:
-            url_file = ts.strftime('native_system_load_and_ties_for_%m_%d_%Y_.html')
+            url_file = ts.strftime('native%%20system%%20load%%20and%%20ties%m_%d_%Y.html')
             mode = 'recent'
         else:
-            dummy, month_length = calendar.monthrange(ts.year, ts.month)
-            url_file = 'Monthly_Ties_and_Loads_L_from_%02d_%02d_%04d_to_%02d_%02d_%04d_.html' % (
-                ts.month, 1, ts.year,
-                ts.month, month_length, ts.year
+            url_file = 'Monthly%%20Ties%%20and%%20Loads_L%02d_%02d_%04d.html' % (
+                ts.month, 1, ts.year
             )
             mode = 'historical'
 
@@ -144,11 +141,11 @@ def fetch_df(self, this_date, url=None, mode=None):
             # pull one day of data out of full df
             full_df = dfs[1]
             date_row_idx = np.where(full_df.index == datestr)[0][0]
-            df = full_df.iloc[date_row_idx:date_row_idx+13]
+            df = full_df.iloc[date_row_idx:date_row_idx+14]
 
         # set and slice header
         df.columns = df.iloc[1]
-        df = df[2:]
+        df = df[3:]
 
         # return
         return df, mode

tests/__init__.py

@@ -15,7 +15,7 @@ def fixture_path(ba_name, filename):
 def read_fixture(ba_name, filename, as_bytes=False):
     """
     :param str ba_name: The balancing authority module name.
-    :param str filename: The fixture file you wish to load.
+    :param str filename: The fixture file (interpreted as a raw string literal) you wish to load.
     :param bool as_bytes: Indicates whether file should open with 'read bytes' mode.
     :return: The file's content.
     """