Merge branch 'feature/storage_passwords' of https://github.com/splunk/splunk-sdk-python into feature/storage_passwords

Author: Sam Stelle

.gitignore

@@ -17,3 +17,5 @@ examples/*/local
 examples/*/metadata
 tests/searchcommands_data/log/
 tests/searchcommands_data/output/
+examples/searchcommands_app/searchcommand_app.log
+Test Results*.html

examples/searchcommands_app/bin/generatehello.py

@@ -16,15 +16,15 @@
 
 import sys, time
 from splunklib.searchcommands import \
-  dispatch, GeneratingCommand, Configuration, Option, validators
+    dispatch, GeneratingCommand, Configuration, Option, validators
 
 @Configuration()
 class GenerateHelloCommand(GeneratingCommand):
-  count = Option(require=True, validate=validators.Integer())
+    count = Option(require=True, validate=validators.Integer())
 
-  def generate(self):
-    for i in range(1, self.count + 1):
-      text = 'Hello World %d' % i
-      yield {'_time': time.time(), 'event_no': i, '_raw': text } 
+    def generate(self):
+        for i in range(1, self.count + 1):
+            text = 'Hello World %d' % i
+            yield {'_time': time.time(), 'event_no': i, '_raw': text } 
 
 dispatch(GenerateHelloCommand, sys.argv, sys.stdin, sys.stdout, __name__)

examples/searchcommands_template/bin/generate.py

@@ -6,18 +6,18 @@
 
 @Configuration()
 class %(command.title())Command(GeneratingCommand):
-   """ %(synopsis)
+    """ %(synopsis)
 
-   ##Syntax
+    ##Syntax
 
-   %(syntax)
+    %(syntax)
 
-   ##Description
+    ##Description
 
-   %(description)
+    %(description)
 
-   """
-   def generate(self):
+    """
+    def generate(self):
        # Put your event  code here
        pass
 

examples/searchcommands_template/bin/stream.py

@@ -7,18 +7,18 @@
 
 @Configuration()
 class %(command.title())Command(StreamingCommand):
-   """ %(synopsis)
+    """ %(synopsis)
 
-   ##Syntax
+    ##Syntax
 
-   %(syntax)
+    %(syntax)
 
-   ##Description
+    ##Description
 
-   %(description)
+    %(description)
 
-   """
-   def stream(self, events):
+    """
+    def stream(self, events):
        # Put your event transformation code here
        pass
 

setup.py

@@ -186,7 +186,7 @@ def exclude(path):
     packages = ["splunklib",
                 "splunklib.modularinput",
                 "splunklib.searchcommands",
-                "splunklib.searchcommands.csv"],
+                "splunklib.searchcommands.splunk_csv"],
 
     url="http://github.com/splunk/splunk-sdk-python",
 

splunklib/binding.py

@@ -115,12 +115,14 @@ class UrlEncoded(str):
         UrlEncoded('ab c') + 'de f' == UrlEncoded('ab cde f')
         'ab c' + UrlEncoded('de f') == UrlEncoded('ab cde f')
     """
-    def __new__(self, val='', skip_encode=False):
+    def __new__(self, val='', skip_encode=False, encode_slash=False):
         if isinstance(val, UrlEncoded):
             # Don't urllib.quote something already URL encoded.
             return val
         elif skip_encode:
             return str.__new__(self, val)
+        elif encode_slash:
+            return str.__new__(self, urllib.quote_plus(val))
         else:
             # When subclassing str, just call str's __new__ method
             # with your class and the value you want to have in the
@@ -464,7 +466,7 @@ def connect(self):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         if self.scheme == "https":
             sock = ssl.wrap_socket(sock)
-        sock.connect((self.host, self.port))
+        sock.connect((socket.gethostbyname(self.host), self.port))
         return sock
 
     @_authentication