Made Stanza.submit accept only dicts, not strings.

Fixed conf.py the example to submit a dict instead of a string.
Added armor to the test in test_examples that tests conf.py.
Removed the unit test that was testing Stanza.submit with a string
as an argument.

Author: Frederick Ross

examples/conf.py

@@ -43,6 +43,8 @@ def create(self, opts):
             kvpair = argv[2].split("=")
             if len(kvpair) != 2:
                 error("Creating a k/v pair requires key and value", 2)
+            else:
+                key, value = kvpair
 
         if not cpres and not spres:
             error("Conf name and stanza name is required for create", 2)
@@ -58,7 +60,7 @@ def create(self, opts):
 
         # create key/value pair under existing stanza
         stanza = conf[stan]
-        stanza.submit(argv[2])
+        stanza.submit({key: value})
 
 
     def delete(self, opts):

splunklib/client.py

@@ -1668,22 +1668,12 @@ class Stanza(Entity):
     def submit(self, stanza):
         """Sets the keys in *stanza* on this Stanza.
 
-        *stanza* will usually be a dictionary of key/value pairs, but can also
-        by a raw string to send as the POST body of the request (e.g.,
-        `"key=some+value&other+key=another+value"`). Sending raw strings should
-        be considered deprecated.
-
         :param stanza: A dictionary of key/value pairs to set in this stanza.
         :type stanza: ``dict``
         :return: The :class:`Stanza` object this method is called on.
         """
-        if isinstance(stanza, str):
-            message = { 'method': "POST", 'body': stanza }
-            self.service.request(self.path, **message)
-        elif isinstance(stanza, dict):
-            body = _encode(**stanza)
-            self.service.post(self.path, body=body)
-
+        body = _encode(**stanza)
+        self.service.post(self.path, body=body)
         return self
 
     def __len__(self):

tests/test_conf.py

@@ -92,13 +92,6 @@ def test_confs(self):
             self.assertTrue(key in stanza)
             self.assertEqual(value, stanza[key])
 
-        key2 = testlib.tmpname()
-        val2 = testlib.tmpname()
-        stanza.submit("%s=%s&%s=%s" % (key2, val2, key2, val2))
-        stanza.refresh()
-        self.assertTrue(key2 in stanza)
-        self.assertEqual(val2, stanza[key2])
-
         count = len(conf)
         conf.delete(stanza_name)
         self.assertFalse(stanza_name in conf)

tests/test_examples.py

@@ -80,14 +80,26 @@ def test_binding1(self):
         self.assertEquals(result, 0)
 
     def test_conf(self):
-        self.check_commands(
-            "conf.py --help",
-            "conf.py",
-            "conf.py viewstates",
-            'conf.py --app=search --owner=admin viewstates',
-            "conf.py create server SDK-STANZA",
-            "conf.py create server SDK-STANZA testkey=testvalue",
-            "conf.py delete server SDK-STANZA")
+        try:
+            conf = self.service.confs['server']
+            if 'SDK-STANZA' in conf:
+                conf.delete("SDK-STANZA")
+        except Exception, e:
+            pass
+
+        try:
+            self.check_commands(
+                "conf.py --help",
+                "conf.py",
+                "conf.py viewstates",
+                'conf.py --app=search --owner=admin viewstates',
+                "conf.py create server SDK-STANZA",
+                "conf.py create server SDK-STANZA testkey=testvalue",
+                "conf.py delete server SDK-STANZA")
+        finally:
+            conf = self.service.confs['server']
+            if 'SDK-STANZA' in conf:
+                conf.delete('SDK-STANZA')
 
     def test_event_types(self):
         self.check_commands(