Two fixes that account for differences between Python 2.6 and Python 2.7

+ Logging level names are unchecked by Python 2.6

  Also improved our own checks and enhanced unit tests coverage. See change to splunklib.searchcommands.search_command.py and tests.searchcommands.test_decorators

+ Expected results for search results info access vary based on Python version number

  See change to tests.searchcommands.test_search_command

Signed-off-by: David Noble <[email protected]>

Author: David Noble

splunklib/searchcommands/search_command.py

@@ -24,7 +24,7 @@
     from ordereddict import OrderedDict # python 2.6
 
 from inspect import getmembers
-from logging import getLevelName
+from logging import _levelNames, getLevelName
 from os import path
 from sys import argv, stdin, stdout
 from urlparse import urlsplit
@@ -106,7 +106,17 @@ def logging_level(self):
     def logging_level(self, value):
         if value is None:
             value = self._default_logging_level
-        self.logger.setLevel(value if type(value) is not str else value.upper())
+        if type(value) is str:
+            try:
+                level = _levelNames[value.upper()]
+            except KeyError:
+                raise ValueError('Unrecognized logging level: %s' % value)
+        else:
+            try:
+                level = int(value)
+            except ValueError:
+                raise ValueError('Unrecognized logging level: %s' % value)
+        self.logger.setLevel(level)
         return
 
     show_configuration = Option(doc='''

tests/searchcommands/test_decorators.py

@@ -66,6 +66,27 @@ def test_builtin_options(self):
                     command.logging_level = variant
                     self.assertEquals(command.logging_level, warning if level_name == notset else level_name)
 
+        # logging_level accepts any numeric value
+
+        for level in 999, 999.999:
+            command.logging_level = level
+            self.assertEqual(command.logging_level, 'Level 999')
+
+        # logging_level raises a value error for unknown logging level names
+
+        current_value = command.logging_level
+
+        try:
+            command.logging_level = 'foo'
+        except ValueError:
+            pass
+        except BaseException as e:
+            self.fail('Expected ValueError, but %s was raised' % type(e))
+        else:
+            self.fail('Expected ValueError, but logging_level=%s' % command.logging_level)
+
+        self.assertEqual(command.logging_level, current_value)
+
         app_root = os.path.join(TestDecorators._package_directory, 'data', 'app')
         command = SearchCommand()  # guarantee: no logging.conf
         directory = os.getcwd()