Fix paths in examples so they'll run straightforwardly.

Frederick Ross · Frederick Ross · commit 7965b65b2fb2 · 2012-12-05T16:23:35.000-08:00
diff --git a/examples/analytics/bottle.py b/examples/analytics/bottle.py
@@ -41,7 +41,7 @@
 from tempfile import TemporaryFile
 from traceback import format_exc
 from urllib import urlencode, quote as urlquote, unquote as urlunquote
-from urlparse import urlunsplit, urljoin, SplitResult as UrlSplitResult
+from urlparse import urljoin, SplitResult as UrlSplitResult
 
 try: from collections import MutableMapping as DictMixin
 except ImportError: # pragma: no cover
diff --git a/examples/analytics/input.py b/examples/analytics/input.py
@@ -14,7 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import urllib2, sys
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../.."))
 from datetime import datetime
 import splunklib.client as client
 
diff --git a/examples/analytics/output.py b/examples/analytics/output.py
@@ -14,7 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import urllib2, sys
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../.."))
 import splunklib.client as client
 import splunklib.results as results
 try:
diff --git a/examples/analytics/server.py b/examples/analytics/server.py
@@ -14,7 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import sys, json
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../.."))
 
 from bottle import route, run, debug, template, static_file, request
 
diff --git a/examples/async/async.py b/examples/async/async.py
@@ -20,10 +20,9 @@
 
 #### Main Code
 
-import sys, datetime
+import sys, os, datetime
 import urllib
-from time import sleep
-sys.path.insert(0, '../')
+sys.path.insert(0, os.path.join(__file__, "../.."))
 
 import splunklib.binding as binding
 import splunklib.client as client
diff --git a/examples/binding1.py b/examples/binding1.py
@@ -19,8 +19,8 @@
    binds to a sampling of endpoints showing how to access collections,
    entities and 'method-like' endpoints."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 from splunklib.binding import connect
 
diff --git a/examples/conf.py b/examples/conf.py
@@ -16,8 +16,8 @@
 
 """Create, delete or list stanza information from/to Splunk confs."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 from splunklib.client import connect
 
diff --git a/examples/dashboard/feed.py b/examples/dashboard/feed.py
@@ -20,7 +20,8 @@
 # in the README.
 
 
-import sys, datetime, urllib2, json
+import sys, os, urllib2, json
+sys.path.insert(0, os.path.join(__file__, "../.."))
 from xml.etree import ElementTree
 
 import splunklib.client as client
diff --git a/examples/event_types.py b/examples/event_types.py
@@ -16,8 +16,8 @@
 
 """A command line utility that lists Splunk event types."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__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, '../../') # Use splunklib and utils without installing
+sys.path.insert(0, os.path.join(__file__, "../.."))
 
 try:
     import utils
diff --git a/examples/export/export.py b/examples/export/export.py
@@ -20,7 +20,8 @@
 """
 
 # installation support files
-import sys
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../.."))
 import time
 from os import path
 
diff --git a/examples/fired_alerts.py b/examples/fired_alerts.py
@@ -16,8 +16,8 @@
 
 """A command line utility that prints out fired alerts."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 from splunklib.client import connect
 
diff --git a/examples/follow.py b/examples/follow.py
@@ -18,8 +18,8 @@
    results to stdout."""
 
 from pprint import pprint
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 import time
 
 import splunklib.client as client
diff --git a/examples/genevents.py b/examples/genevents.py
@@ -17,8 +17,8 @@
 """A tool to generate event data to a named index."""
 
 import socket
-import sys
-sys.path.insert(0, '..')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 import time
 import datetime
 from splunklib.client import connect
diff --git a/examples/handlers/handler_certs.py b/examples/handlers/handler_certs.py
@@ -37,7 +37,8 @@
 import ssl
 import socket
 import sys
-sys.path.insert(0, '../')
+import os
+sys.path.insert(0, os.path.join(__file__, "../.."))
 import urllib
 
 import splunklib.client as client
diff --git a/examples/handlers/handler_debug.py b/examples/handlers/handler_debug.py
@@ -18,9 +18,8 @@
    and prints debugging information to stdout."""
 
 from pprint import pprint
-from StringIO import StringIO
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__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
@@ -28,8 +28,8 @@
 
 from pprint import pprint
 from StringIO import StringIO
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../.."))
 import urllib2
 
 import splunklib.client as client
diff --git a/examples/handlers/handler_urllib2.py b/examples/handlers/handler_urllib2.py
@@ -18,8 +18,8 @@
 
 from pprint import pprint
 from StringIO import StringIO
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../.."))
 import urllib2
 
 import splunklib.client as client
diff --git a/examples/index.py b/examples/index.py
@@ -16,8 +16,8 @@
 
 """A command line utility for interacting with Splunk indexes."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 from splunklib.client import connect
 
diff --git a/examples/info.py b/examples/info.py
@@ -16,8 +16,8 @@
 
 """An example that prints Splunk service info & settings."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 import splunklib.client as client
 
diff --git a/examples/inputs.py b/examples/inputs.py
@@ -16,8 +16,8 @@
 
 """A command line utility for interacting with Splunk inputs."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 from splunklib.client import connect
 
diff --git a/examples/job.py b/examples/job.py
@@ -22,8 +22,8 @@
 # on.
 
 from pprint import pprint
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 from splunklib.client import connect
 try:
diff --git a/examples/loggers.py b/examples/loggers.py
@@ -17,8 +17,8 @@
 """A command line tool lists out the Splunk logging categories and their
    current logging level."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 import splunklib.client as client
 
diff --git a/examples/oneshot.py b/examples/oneshot.py
@@ -18,8 +18,8 @@
 
 from pprint import pprint
 import socket
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 from splunklib.client import connect
 import splunklib.results as results
diff --git a/examples/results.py b/examples/results.py
@@ -19,8 +19,8 @@
    example, eg: './search.py "search 404" | ./results.py'"""
  
 from pprint import pprint
-import sys
-import time
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 import splunklib.results as results
 
diff --git a/examples/saved_search/saved_search.py b/examples/saved_search/saved_search.py
@@ -17,7 +17,9 @@
 """A command line utility for manipulating saved searches 
    (list-all/create/list/delete)."""
 
-import sys
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../.."))
+
 import urllib
 
 import splunklib.binding as binding
diff --git a/examples/saved_searches.py b/examples/saved_searches.py
@@ -16,8 +16,8 @@
 
 """A command line utility that lists saved searches."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 from splunklib.client import connect
 
diff --git a/examples/search.py b/examples/search.py
@@ -16,10 +16,8 @@
 
 """A command line utility for executing Splunk searches."""
 
-from pprint import pprint
-
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 from time import sleep
 
 from splunklib.binding import HTTPError
diff --git a/examples/spcmd.py b/examples/spcmd.py
@@ -28,8 +28,8 @@
     import readline # Activates readline editing, ignore for windows
 except ImportError:
     pass
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 import splunklib.client as client
 
diff --git a/examples/spurl.py b/examples/spurl.py
@@ -16,8 +16,8 @@
 
 """A simple command line interface for the Splunk REST APIs."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 from xml.etree import ElementTree
 
 import splunklib.binding as binding
diff --git a/examples/stail.py b/examples/stail.py
@@ -17,8 +17,8 @@
 """Tails a realtime search using the export endpoint and prints results to
    stdout."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 from pprint import pprint
 
diff --git a/examples/submit.py b/examples/submit.py
@@ -16,8 +16,8 @@
 
 """A command line utility that submits event data to Splunk from stdin."""
 
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 
 import splunklib.client as client
 
diff --git a/examples/twitted/input.py b/examples/twitted/input.py
@@ -22,6 +22,9 @@
 import json
 import socket
 import sys
+import os
+sys.path.insert(0, os.path.join(__file__, "../.."))
+
 
 import splunklib.client as client
 
diff --git a/examples/upload.py b/examples/upload.py
@@ -17,8 +17,8 @@
 """A command line utility that uploads a file to Splunk for indexing."""
 
 from os import path
-import sys
-sys.path.insert(0, '../')
+import sys, os
+sys.path.insert(0, os.path.join(__file__, "../"))
 import splunklib.client as client
 
 try:
