@@ -18,46 +18,35 @@
 All rights reserved.
 MIT Licensed (see README file for details)
 """
+import sys, re, os, site
 
 __version__ = '0.9.4'
 __author__  = 'Christian Swinehart'
-__email__   = "drafting@samizdat.cc"
+__email__   = 'drafting@samizdat.cc'
 __credits__ = 'Frederik De Bleser, Tom De Smedt, Just van Rossum, & Marcos Ojeda'
 __license__ = 'MIT'
 
-
-# add the shared directory (for Libraries) to the path
-import sys, re, os
-sys.path.append(os.path.join(os.getenv('HOME'), 'Library', 'Application Support', 'PlotDevice'))
-
-# add the Extras directory to sys.path since every module depends on PyObjC and friends
-try:
-    import objc
-except ImportError:
-    extras = '/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python'
-    sys.path.extend([extras, '%s/PyObjC'%extras])
-    import objc
-
-# print python exceptions to the console rather than silently failing
-objc.setVerbose(True)
-
-# the global non-conflicting token (fingers crossed)
-INTERNAL = '_p_l_o_t_d_e_v_i_c_e_'
-
-# please excuse our technical difficulties
-class DeviceError(Exception):
-    pass
-
-# special exception to cleanly exit animations
-class Halted(Exception):
-    pass
+INTERNAL = '_p_l_o_t_d_e_v_i_c_e_' # the global non-conflicting token (fingers crossed)
+class DeviceError(Exception): pass # please excuse our technical difficulties
+class Halted(Exception): pass      # special exception to cleanly exit animations
 
 # note whether the module is being used within the .app, via console.py, or from the repl
 called_from = getattr(sys.modules['__main__'], '__file__', '<interactive>')
 is_windowed = bool(re.search(r'plotdevice(-app|/run/console)\.py$', called_from))
 in_setup = bool(called_from.endswith('setup.py')) # (for builds)
 
-# populate the namespace (or don't) accordingly
+# don't mess with sys.path during builds
+if not in_setup:
+    # use the bundled copy of PyObjC rather than the system version
+    from .run import objc
+
+    # add the shared directory (for Libraries) to the path
+    sys.path.append(os.path.join(os.getenv('HOME'), 'Library', 'Application Support', 'PlotDevice'))
+
+    # print python exceptions to the console rather than silently failing
+    objc.setVerbose(True)
+
+# populate the namespace (or don't) depending on the context
 if is_windowed or in_setup:
     # if a script imports * from within the app/tool, nothing should be (re-)added to the
     # global namespace. we'll let the Sandbox handle populating the namespace instead.
 
@@ -4,12 +4,12 @@
 # do some special-case handling when the module is imported from within the source dist
 # (determined by checking the existence project files at a known path). if we're in the
 # source dist, add the build dir to the path so we can pick up the .so files,
-module_root = abspath(join(abspath(dirname(__file__)), '../..'))
-if exists(join(module_root, 'app/PlotDevice-Info.plist')):
-    so_dir = join(module_root, 'build/lib/plotdevice/lib')
+dist_root = abspath(join(abspath(dirname(__file__)), '../..'))
+if exists(join(dist_root, 'app/PlotDevice-Info.plist')):
+    so_dir = join(dist_root, 'build/lib/plotdevice/lib')
     sys.path.append(so_dir)
     if not exists(so_dir):
-        unbuilt = 'Build the plotdevice module with `python setup.pt build\' before attempting import it.'
+        unbuilt = 'Build the plotdevice module with `python setup.py build\' before attempting import it.'
         raise RuntimeError(unbuilt)
 
 # test the sys.path by attempting to load the c-extensions
 
@@ -1,8 +1,25 @@
-import linecache, re
-from sys import exc_info
-from os.path import abspath, dirname, relpath
+import re, sys, site, linecache
+from os.path import abspath, dirname, relpath, exists, join
 from traceback import format_list, format_exception_only
-from AppKit import NSBundle
+
+# add our embedded PyObjC site-dir to the sys.path
+dist_root = abspath(join(dirname(__file__), '../..'))
+if exists(join(dist_root, 'app/PlotDevice-Info.plist')):
+    # if run from the sdist, look in the build dir...
+    objc_dir = join(dist_root, 'build/lib/plotdevice/lib/PyObjC')
+else:
+    # ...otherwise find the modules in .lib
+    objc_dir = abspath(join(dirname(__file__), '../lib/PyObjC'))
+map(sys.path.remove, filter(lambda p:p.endswith('PyObjC'), sys.path))
+site.addsitedir(objc_dir)
+
+# test the sys.path by attempting to load a PyObjC submodule
+try:
+    import objc
+except:
+    unbuilt = 'Build the plotdevice module with `python setup.py build\' before attempting import it.'
+    raise RuntimeError(unbuilt)
+
 
 def encoding(src):
     """Searches the first two lines of a string looking for an `# encoding: ???` comment."""
@@ -51,7 +68,7 @@ def stacktrace(script=None, src=None):
 def coredump(script=None, src=None, syntax=True):
     """Get a clean stacktrace with absolute paths and source pulled from the editor rather than disk"""
     # use the most recently caught exception
-    etype, value, tb = exc_info()
+    etype, value, tb = sys.exc_info()
     script = script or '<Untitled>' if src else None
     frames = extract_tb(tb, script, src)
 
@@ -85,6 +102,7 @@ def extract_tb(tb, script=None, src=None):
         tb = tb.tb_next
 
     # omit the internal plotdevice stack frames in `dist` builds
+    from AppKit import NSBundle
     debug = 'flux' in NSBundle.mainBundle().infoDictionary().get('CFBundleVersion','')
     if not debug:
         moduledir = abspath(dirname(dirname(__file__)))