Merge pull request #191 from vaputa/master

python 3 support

Author: shakeelmohamed

.travis.yml

@@ -37,6 +37,8 @@ language: python
 
 python:
   - "2.7"
+  - "2.6"
+  - "3.5"
 
 install: "pip install unittest2"
 

CHANGELOG.md

@@ -558,3 +558,4 @@ API reference under the section on accessing Splunk resources at:
 ## 0.1.0 (preview)
 
 * Initial Python SDK release
+

examples/abc/a.py

@@ -15,7 +15,9 @@
 """Retrieves a list of installed apps from Splunk by making REST API calls
    using Python's httplib module."""
 
-import httplib
+from __future__ import absolute_import
+from __future__ import print_function
+import splunklib.six.moves.http_client
 import urllib
 from xml.etree import ElementTree
 
@@ -25,7 +27,7 @@
 PASSWORD = "changeme"
 
 # Present credentials to Splunk and retrieve the session key
-connection = httplib.HTTPSConnection(HOST, PORT)
+connection = six.moves.http_client.HTTPSConnection(HOST, PORT)
 body = urllib.urlencode({'username': USERNAME, 'password': PASSWORD})
 headers = { 
     'Content-Type': "application/x-www-form-urlencoded", 
@@ -40,12 +42,12 @@
 finally:
     connection.close()
 if response.status != 200:
-    raise Exception, "%d (%s)" % (response.status, response.reason)
+    raise Exception("%d (%s)" % (response.status, response.reason))
 body = response.read()
 sessionKey = ElementTree.XML(body).findtext("./sessionKey")
 
 # Now make the request to Splunk for list of installed apps
-connection = httplib.HTTPSConnection(HOST, PORT)
+connection = six.moves.http_client.HTTPSConnection(HOST, PORT)
 headers = { 
     'Content-Length': "0",
     'Host': HOST,
@@ -59,10 +61,10 @@
 finally:
     connection.close()
 if response.status != 200:
-    raise Exception, "%d (%s)" % (response.status, response.reason)
+    raise Exception("%d (%s)" % (response.status, response.reason))
 
 body = response.read()
 data = ElementTree.XML(body)
 apps = data.findall("{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title")
 for app in apps: 
-    print app.text
+    print(app.text)

examples/abc/b.py

@@ -14,6 +14,8 @@
 
 """Retrieves a list of installed apps from Splunk using the binding module."""
 
+from __future__ import absolute_import
+from __future__ import print_function
 import sys, os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 
@@ -34,11 +36,11 @@
 
 response = context.get('apps/local')
 if response.status != 200:
-    raise Exception, "%d (%s)" % (response.status, response.reason)
+    raise Exception("%d (%s)" % (response.status, response.reason))
 
 body = response.body.read()
 data = ElementTree.XML(body)
 apps = data.findall("{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title")
 for app in apps: 
-    print app.text
+    print(app.text)
 

examples/abc/c.py

@@ -13,6 +13,8 @@
 # under the License.
 
 """Retrieves a list of installed apps from Splunk using the client module."""
+from __future__ import absolute_import
+from __future__ import print_function
 import sys, os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 
@@ -30,4 +32,4 @@
     password=PASSWORD)
 
 for app in service.apps:
-    print app.name
+    print(app.name)

examples/analytics/__init__.py

@@ -14,5 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import input
-import output
+from __future__ import absolute_import
+from . import input
+from . import output