Fix of #85, the commit was somehow lost

Author: Sam Stelle

tests/test_utils.py

@@ -0,0 +1,93 @@
+import os
+from subprocess import PIPE, Popen
+from os.path import expanduser
+import time
+import sys
+
+import testlib 
+
+import splunklib.client as client
+from splunklib.binding import UrlEncoded
+
+try:
+    from utils import *
+except ImportError:
+    raise Exception("Add the SDK repository to your PYTHONPATH to run the examples "
+                    "(e.g., export PYTHONPATH=~/splunk-sdk-python.")
+
+
+TEST_DICT = {
+            'username':'admin',
+            'password':'changeme',
+            'port' : 8089,
+            'host' : 'localhost',
+            'scheme': 'https'
+            }
+
+class TestUtils(testlib.SDKTestCase):
+    def setUp(self):
+        super(TestUtils, self).setUp()
+
+    # Test dslice when a dict is passed to change key names
+    def test_dslice_dict_args(self):
+        args = {
+            'username':'user-name', 
+            'password':'new_password', 
+            'port': 'admin_port', 
+            'foo':'bar'
+            }
+        expected = {
+            'user-name':'admin', 
+            'new_password':'changeme', 
+            'admin_port':8089
+            }
+        self.assertTrue(expected == dslice(TEST_DICT, args))
+
+    # Test dslice when a list is passed
+    def test_dslice_list_args(self):
+        test_list = [
+            'username',
+            'password',
+            'port',
+            'host',
+            'foo'
+            ]
+        expected = {
+            'username':'admin',
+            'password':'changeme',
+            'port':8089,
+            'host':'localhost'
+            }
+        self.assertTrue(expected == dslice(TEST_DICT, test_list))
+
+    # Test dslice when a single string is passed
+    def test_dslice_arg(self):
+        test_arg = 'username'
+        expected = {
+            'username':'admin'
+            }
+        self.assertTrue(expected == dslice(TEST_DICT, test_arg))
+
+    # Test dslice using all three types of arguments
+    def test_dslice_all_args(self):
+        test_args = [
+            {'username':'new_username'},
+            ['password',
+            'host'],
+            'port'
+        ]
+        expected = {
+            'new_username':'admin',
+            'password':'changeme',
+            'host':'localhost',
+            'port':8089
+        }
+        self.assertTrue(expected == dslice(TEST_DICT, *test_args))
+
+
+if __name__ == "__main__":
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+    unittest.main()

utils/__init__.py

@@ -90,7 +90,8 @@ def dslice(value, *args):
                 if value.has_key(k): 
                     result[k] = value[k]
         else:
-            if value.has_key(arg): result[arg]
+            if value.has_key(arg): 
+                result[arg] = value[arg]
     return result
 
 def parse(argv, rules=None, config=None, **kwargs):