Allows reading TMY data from a Path or file-like object

Author: jerluc

pvlib/iotools/tmy.py

@@ -4,6 +4,8 @@
 import re
 import pandas as pd
 
+from pvlib.tools import _file_context_manager
+
 # Dictionary mapping TMY3 names to pvlib names
 VARIABLE_MAP = {
     'GHI (W/m^2)': 'ghi',
@@ -22,7 +24,7 @@
 }
 
 
-def read_tmy3(filename, coerce_year=None, map_variables=True, encoding=None):
+def read_tmy3(filename_or_obj, coerce_year=None, map_variables=True, encoding=None):
     """Read a TMY3 file into a pandas dataframe.
 
     Note that values contained in the metadata dictionary are unchanged
@@ -35,7 +37,7 @@ def read_tmy3(filename, coerce_year=None, map_variables=True, encoding=None):
 
     Parameters
     ----------
-    filename : str
+    filename_or_obj : str, Path, or file-like object
         A relative file path or absolute file path.
     coerce_year : int, optional
         If supplied, the year of the index will be set to ``coerce_year``, except
@@ -186,7 +188,7 @@ def read_tmy3(filename, coerce_year=None, map_variables=True, encoding=None):
     """  # noqa: E501
     head = ['USAF', 'Name', 'State', 'TZ', 'latitude', 'longitude', 'altitude']
 
-    with open(str(filename), 'r', encoding=encoding) as fbuf:
+    with _file_context_manager(filename_or_obj, mode="r", encoding=encoding) as fbuf:
         # header information on the 1st line (0 indexing)
         firstline = fbuf.readline()
         # use pandas to read the csv file buffer

pvlib/tools.py

@@ -562,7 +562,7 @@ def normalize_max2one(a):
     return res
 
 
-def _file_context_manager(filename_or_object, mode='r'):
+def _file_context_manager(filename_or_object, mode='r', encoding=None):
     """
     Open a filename/path for reading, or pass a file-like object
     through unchanged.
@@ -584,5 +584,5 @@ def _file_context_manager(filename_or_object, mode='r'):
         context = contextlib.nullcontext(filename_or_object)
     else:
         # otherwise, assume a filename or path
-        context = open(str(filename_or_object), mode=mode)
+        context = open(str(filename_or_object), mode=mode, encoding=encoding)
     return context

tests/iotools/test_tmy.py

@@ -18,6 +18,10 @@
 def test_read_tmy3():
     tmy.read_tmy3(TMY3_TESTFILE, map_variables=False)
 
+def test_read_tmy3_buffer():
+    with open(TMY3_TESTFILE) as f:
+        tmy.read_tmy3(f, map_variables=False)
+
 
 def test_read_tmy3_norecolumn():
     data, _ = tmy.read_tmy3(TMY3_TESTFILE, map_variables=False)