Change option name for better option hierarchy

Author: Kevin D Smith

swat/cas/datamsghandlers.py

@@ -336,10 +336,10 @@ def get(arr, idx, default=0):
                                self._sw_databuffer)
             elif vrtype == 'NUMERIC' and vtype in ['INT32', 'DATE']:
                 if pd.isnull(value):
-                    value = get_option('cas.%s_missing' % vtype.lower())
+                    value = get_option('cas.missing.%s' % vtype.lower())
                     warnings.warn(("Missing value found in 32-bit integer-based column '%s'.\n" %
                                    v['name']) +
-                                  ("Substituting cas.%s_missing option value (%s)." %
+                                  ("Substituting cas.missing.%s option value (%s)." %
                                    (vtype.lower(), value)),
                                   RuntimeWarning)
                 if length > 4:
@@ -353,10 +353,10 @@ def get(arr, idx, default=0):
                                self._sw_databuffer)
             elif vrtype == 'NUMERIC' and vtype in ['INT64', 'DATETIME', 'TIME']:
                 if pd.isnull(value):
-                    value = get_option('cas.%s_missing' % vtype.lower())
+                    value = get_option('cas.missing.%s' % vtype.lower())
                     warnings.warn(("Missing value found in 64-bit integer-based column '%s'.\n"
                                    % v['name']) +
-                                  ("Substituting cas.%s_missing option value (%s)." %
+                                  ("Substituting cas.missing.%s option value (%s)." %
                                    (vtype.lower(), value)),
                                   RuntimeWarning)
                 if length > 8:

swat/config.py

@@ -140,19 +140,19 @@ def check_severity(sev):
 # Integer missing value substitutions
 #
 
-register_option('cas.int64_missing', 'int', check_int, -2**(64-1),
+register_option('cas.missing.int64', 'int', check_int, -2**(64-1),
                 'Sets substitution value for int64 missing values.')
 
-register_option('cas.int32_missing', 'int', check_int, -2**(32-1),
+register_option('cas.missing.int32', 'int', check_int, -2**(32-1),
                 'Sets substitution value for int32 missing values.')
 
-register_option('cas.date_missing', 'int', check_int, -2**(32-1),
+register_option('cas.missing.date', 'int', check_int, -2**(32-1),
                 'Sets substitution value for date missing values.')
 
-register_option('cas.time_missing', 'int', check_int, -2**(64-1),
+register_option('cas.missing.time', 'int', check_int, -2**(64-1),
                 'Sets substitution value for time missing values.')
 
-register_option('cas.datetime_missing', 'int', check_int, -2**(64-1),
+register_option('cas.missing.datetime', 'int', check_int, -2**(64-1),
                 'Sets substitution value for datetime missing values.')
 
 #

swat/tests/cas/test_basics.py

@@ -52,7 +52,7 @@ def setUp(self):
         swat.reset_option()
         swat.options.cas.print_messages = False
         swat.options.interactive_mode = True
-        swat.options.int64_missing = -999999
+        swat.options.cas.missing.int64 = -999999
 
         self.s = swat.CAS(HOST, PORT, USER, PASSWD, protocol=PROTOCOL)
 

swat/tests/cas/test_datamsg.py

@@ -52,7 +52,7 @@ def setUp(self):
         swat.reset_option()
         swat.options.cas.print_messages = False
         swat.options.interactive_mode = False
-        swat.options.int64_missing = -999999
+        swat.options.cas.missing.int64 = -999999
 
         self.s = swat.CAS(HOST, PORT, USER, PASSWD, protocol=PROTOCOL)
 

swat/tests/cas/test_table.py

@@ -59,7 +59,7 @@ def setUp(self):
         swat.options.cas.trace_actions = False
         swat.options.cas.trace_ui_actions = False
         swat.options.interactive_mode = False
-        swat.options.int64_missing = -999999
+        swat.options.cas.missing.int64 = -999999
 
         self.s = swat.CAS(HOST, PORT, USER, PASSWD, protocol=PROTOCOL)
 

swat/tests/test_config.py

@@ -245,12 +245,10 @@ def test_doc(self):
 
     def test_suboptions(self):
         self.assertEqual(list(sorted(get_suboptions('cas').keys())), 
-                         ['dataset', 'date_missing', 'datetime_missing', 
-                          'exception_on_severity', 'hostname',
-                          'int32_missing', 'int64_missing',
+                         ['dataset', 'exception_on_severity',
+                          'hostname', 'missing',
                           'port', 'print_messages', 'protocol',
-                          'time_missing', 'trace_actions',
-                          'trace_ui_actions'])
+                          'trace_actions', 'trace_ui_actions'])
 
         with self.assertRaises(SWATOptionError):
             get_suboptions('cas.foo')