Per #1700, lots of little changes to make the python scripts consiste…

…nt, updating the write*.py functions to add the user script directory to the system path, and remove extraneous log messages.

met/data/wrappers/Makefile.am

@@ -24,10 +24,10 @@ wrappers_DATA = \
      generic_python.py \
      generic_pickle.py \
      read_tmp_dataplane.py \
-     write_tmp_dataplane.py \
-     write_pickle_mpr.py \
      read_tmp_ascii.py \
-     write_tmp_point.py
+     write_tmp_dataplane.py \
+     write_tmp_point.py \
+     write_tmp_mpr.py
 
 EXTRA_DIST = ${wrappers_DATA}
 

met/data/wrappers/read_tmp_ascii.py

@@ -28,7 +28,6 @@ def read_tmp_ascii(filename):
     Returns:
         (list of lists): point data
     """
-    print('read_tmp_ascii:' + filename)
     f = open(filename, 'r')
     lines = f.readlines()
     f.close()

met/data/wrappers/write_tmp_dataplane.py

@@ -13,6 +13,10 @@
 import importlib.util
 import netCDF4 as nc
 
+print("Python Script:\t"  + repr(sys.argv[0]))
+print("User Command:\t"   + repr(' '.join(sys.argv[2:])))
+print("Temporary File:\t" + repr(sys.argv[1]))
+
 netcdf_filename = sys.argv[1]
 pyembed_module_name = sys.argv[2]
 sys.argv = sys.argv[2:]

met/data/wrappers/write_tmp_mpr.py

@@ -3,8 +3,8 @@
 #    Adapted from a script provided by George McCabe
 #    Adapted by Randy Bullock
 #
-#    usage:  /path/to/python write_pickle_mpr.py \
-#            pickle_output_filename <user_python_script>.py <args>
+#    usage:  /path/to/python write_tmp_mpr.py \
+#            tmp_output_filename <user_python_script>.py <args>
 #
 ########################################################################
 
@@ -13,21 +13,28 @@
 import pickle
 import importlib.util
 
-print('Python Script:\t', sys.argv[0])
-print('User Command:\t',  sys.argv[2:])
-print('Write Pickle:\t',  sys.argv[1])
-
-pickle_filename = sys.argv[1]
+print("Python Script:\t"  + repr(sys.argv[0]))
+print("User Command:\t"   + repr(' '.join(sys.argv[2:])))
+print("Temporary File:\t" + repr(sys.argv[1]))
 
+tmp_filename = sys.argv[1]
 pyembed_module_name = sys.argv[2]
 sys.argv = sys.argv[2:]
 
+# append user script dir to system path
+pyembed_dir, pyembed_file = os.path.split(pyembed_module_name)
+if pyembed_dir:
+    sys.path.insert(0, pyembed_dir)
+
+if not pyembed_module_name.endswith('.py'):
+    pyembed_module_name += '.py'
+
 user_base = os.path.basename(pyembed_module_name).replace('.py','')
 
 spec = importlib.util.spec_from_file_location(user_base, pyembed_module_name)
 met_in = importlib.util.module_from_spec(spec)
 spec.loader.exec_module(met_in)
 
-print(met_in)
-
-pickle.dump( met_in.mpr_data, open( pickle_filename, "wb" ) )
+f = open(tmp_filename, 'w')
+for line in met_in.mpr_data:
+    f.write(str(line) + '\n')

met/data/wrappers/write_tmp_point.py

@@ -4,23 +4,30 @@
 #    Adapted by Randy Bullock
 #
 #    usage:  /path/to/python write_tmp_point.py \
-#            tmp_ascii_output_filename <user_python_script>.py <args>
+#            tmp_output_filename <user_python_script>.py <args>
 #
 ########################################################################
 
 import os
 import sys
 import importlib.util
 
-print('Python Script:\t', sys.argv[0])
-print('User Command:\t',  sys.argv[2:])
-print('Write Temporary Ascii:\t',  sys.argv[1])
+print("Python Script:\t"  + repr(sys.argv[0]))
+print("User Command:\t"   + repr(' '.join(sys.argv[2:])))
+print("Temporary File:\t" + repr(sys.argv[1]))
 
 tmp_filename = sys.argv[1]
-
 pyembed_module_name = sys.argv[2]
 sys.argv = sys.argv[2:]
 
+# append user script dir to system path
+pyembed_dir, pyembed_file = os.path.split(pyembed_module_name)
+if pyembed_dir:
+    sys.path.insert(0, pyembed_dir)
+
+if not pyembed_module_name.endswith('.py'):
+    pyembed_module_name += '.py'
+
 user_base = os.path.basename(pyembed_module_name).replace('.py','')
 
 spec = importlib.util.spec_from_file_location(user_base, pyembed_module_name)

met/scripts/python/read_ascii_mpr.py

@@ -6,7 +6,7 @@
 
 ########################################################################
 
-print('Python Script:\t', sys.argv[0])
+print("Python Script:\t" + repr(sys.argv[0]))
 
    ##
    ##  input file specified on the command line

met/scripts/python/read_ascii_numpy.py

@@ -6,7 +6,7 @@
 
 ###########################################
 
-print('Python Script:\t', sys.argv[0])
+print("Python Script:\t" + repr(sys.argv[0]))
 
    ##
    ##  input file specified on the command line

met/scripts/python/read_ascii_numpy_grid.py

@@ -6,7 +6,7 @@
 
 ###########################################
 
-print('Python Script:\t', sys.argv[0])
+print("Python Script:\t" + repr(sys.argv[0]))
 
    ##
    ##  input file specified on the command line

met/scripts/python/read_ascii_point.py

@@ -6,7 +6,7 @@
 
 ########################################################################
 
-print('Python Script:\t', sys.argv[0])
+print("Python Script:\t" + repr(sys.argv[0]))
 
    ##
    ##  input file specified on the command line

met/scripts/python/read_ascii_xarray.py

@@ -7,7 +7,7 @@
 
 ###########################################
 
-print('Python Script:\t', sys.argv[0])
+print("Python Script:\t" + repr(sys.argv[0]))
 
    ##
    ##  input file specified on the command line