Made the relative path better formed and cross platform friendly in the examples.

Frederick Ross · Frederick Ross · commit fa71274f5858 · 2012-12-05T16:36:40.000-08:00
diff --git a/examples/analytics/input.py b/examples/analytics/input.py
@@ -15,7 +15,7 @@
 # under the License.
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 from datetime import datetime
 import splunklib.client as client
 
diff --git a/examples/analytics/output.py b/examples/analytics/output.py
@@ -15,7 +15,7 @@
 # under the License.
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 import splunklib.client as client
 import splunklib.results as results
 try:
diff --git a/examples/analytics/server.py b/examples/analytics/server.py
@@ -15,7 +15,7 @@
 # under the License.
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 
 from bottle import route, run, debug, template, static_file, request
 
diff --git a/examples/async/async.py b/examples/async/async.py
@@ -22,7 +22,7 @@
 
 import sys, os, datetime
 import urllib
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 
 import splunklib.binding as binding
 import splunklib.client as client
diff --git a/examples/binding1.py b/examples/binding1.py
@@ -20,7 +20,7 @@
    entities and 'method-like' endpoints."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from splunklib.binding import connect
 
diff --git a/examples/conf.py b/examples/conf.py
@@ -17,7 +17,7 @@
 """Create, delete or list stanza information from/to Splunk confs."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from splunklib.client import connect
 
diff --git a/examples/dashboard/feed.py b/examples/dashboard/feed.py
@@ -21,7 +21,7 @@
 
 
 import sys, os, urllib2, json
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 from xml.etree import ElementTree
 
 import splunklib.client as client
diff --git a/examples/event_types.py b/examples/event_types.py
@@ -17,7 +17,7 @@
 """A command line utility that lists Splunk event types."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from splunklib.client import connect
 
diff --git a/examples/explorer/explorer.py b/examples/explorer/explorer.py
@@ -19,7 +19,7 @@
 import sys
 import os
 
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 
 try:
     import utils
diff --git a/examples/export/export.py b/examples/export/export.py
@@ -21,7 +21,7 @@
 
 # installation support files
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 import time
 from os import path
 
diff --git a/examples/fired_alerts.py b/examples/fired_alerts.py
@@ -17,7 +17,7 @@
 """A command line utility that prints out fired alerts."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from splunklib.client import connect
 
diff --git a/examples/follow.py b/examples/follow.py
@@ -19,7 +19,7 @@
 
 from pprint import pprint
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 import time
 
 import splunklib.client as client
diff --git a/examples/genevents.py b/examples/genevents.py
@@ -18,7 +18,7 @@
 
 import socket
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 import time
 import datetime
 from splunklib.client import connect
diff --git a/examples/handlers/handler_certs.py b/examples/handlers/handler_certs.py
@@ -38,7 +38,7 @@
 import socket
 import sys
 import os
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 import urllib
 
 import splunklib.client as client
diff --git a/examples/handlers/handler_debug.py b/examples/handlers/handler_debug.py
@@ -19,7 +19,7 @@
 
 from pprint import pprint
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 
 import splunklib.binding as binding
 import splunklib.client as client
diff --git a/examples/handlers/handler_proxy.py b/examples/handlers/handler_proxy.py
@@ -29,7 +29,7 @@
 from pprint import pprint
 from StringIO import StringIO
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 import urllib2
 
 import splunklib.client as client
diff --git a/examples/handlers/handler_urllib2.py b/examples/handlers/handler_urllib2.py
@@ -19,7 +19,7 @@
 from pprint import pprint
 from StringIO import StringIO
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 import urllib2
 
 import splunklib.client as client
diff --git a/examples/index.py b/examples/index.py
@@ -17,7 +17,7 @@
 """A command line utility for interacting with Splunk indexes."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from splunklib.client import connect
 
diff --git a/examples/info.py b/examples/info.py
@@ -17,7 +17,7 @@
 """An example that prints Splunk service info & settings."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 import splunklib.client as client
 
diff --git a/examples/inputs.py b/examples/inputs.py
@@ -17,7 +17,7 @@
 """A command line utility for interacting with Splunk inputs."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from splunklib.client import connect
 
diff --git a/examples/job.py b/examples/job.py
@@ -23,7 +23,7 @@
 
 from pprint import pprint
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from splunklib.client import connect
 try:
diff --git a/examples/loggers.py b/examples/loggers.py
@@ -18,7 +18,7 @@
    current logging level."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 import splunklib.client as client
 
diff --git a/examples/oneshot.py b/examples/oneshot.py
@@ -19,7 +19,7 @@
 from pprint import pprint
 import socket
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from splunklib.client import connect
 import splunklib.results as results
diff --git a/examples/results.py b/examples/results.py
@@ -20,7 +20,7 @@
  
 from pprint import pprint
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 import splunklib.results as results
 
diff --git a/examples/saved_search/saved_search.py b/examples/saved_search/saved_search.py
@@ -18,7 +18,7 @@
    (list-all/create/list/delete)."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 
 import urllib
 
diff --git a/examples/saved_searches.py b/examples/saved_searches.py
@@ -17,7 +17,7 @@
 """A command line utility that lists saved searches."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from splunklib.client import connect
 
diff --git a/examples/search.py b/examples/search.py
@@ -17,7 +17,7 @@
 """A command line utility for executing Splunk searches."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 from time import sleep
 
 from splunklib.binding import HTTPError
diff --git a/examples/spcmd.py b/examples/spcmd.py
@@ -29,7 +29,7 @@
 except ImportError:
     pass
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 import splunklib.client as client
 
diff --git a/examples/spurl.py b/examples/spurl.py
@@ -17,7 +17,7 @@
 """A simple command line interface for the Splunk REST APIs."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 from xml.etree import ElementTree
 
 import splunklib.binding as binding
diff --git a/examples/stail.py b/examples/stail.py
@@ -18,7 +18,7 @@
    stdout."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from pprint import pprint
 
diff --git a/examples/submit.py b/examples/submit.py
@@ -17,7 +17,7 @@
 """A command line utility that submits event data to Splunk from stdin."""
 
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 import splunklib.client as client
 
diff --git a/examples/twitted/input.py b/examples/twitted/input.py
@@ -23,7 +23,7 @@
 import socket
 import sys
 import os
-sys.path.insert(0, os.path.join(__file__, "../.."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
 
 
 import splunklib.client as client
diff --git a/examples/upload.py b/examples/upload.py
@@ -18,7 +18,7 @@
 
 from os import path
 import sys, os
-sys.path.insert(0, os.path.join(__file__, "../"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 import splunklib.client as client
 
 try:
