[Pybridge-commits] SF.net SVN: pybridge: [337] trunk/pybridge/bin

[<umg...@us...>]

Revision: 337
Author:   umgangee
Date:     2006-08-15 08:02:10 -0700 (Tue, 15 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/pybridge/?rev=337&view=rev

Log Message:
-----------
Add detection of lib/python/pybridge/ package. Removed detection of lib/python2.X/site-packages/pybridge, since "import pybridge" does that automatically!

Modified Paths:
--------------
    trunk/pybridge/bin/pybridge
    trunk/pybridge/bin/pybridge-server
Modified: trunk/pybridge/bin/pybridge
===================================================================
--- trunk/pybridge/bin/pybridge	2006-08-14 20:12:33 UTC (rev 336)
+++ trunk/pybridge/bin/pybridge	2006-08-15 15:02:10 UTC (rev 337)
@@ -18,7 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-import os, sys
+import os
+import sys
 
 
 PYTHON_VERSION = sys.version_info[:2]
@@ -44,19 +45,19 @@
     raise SystemExit("Error: Twisted Core %s or higher required" % TWISTED_REQUIRED)
 
 
-# Determine the base directory.
-currentdir = os.path.dirname(os.path.abspath(sys.argv[0]))
-basedir = os.path.abspath(os.path.join(currentdir, '..'))
+try:  # If PyBridge is installed system-wide, this finds it automatically.
+    import pybridge
+except ImportError:  # Locate the PyBridge package.
+    currentdir = os.path.dirname(os.path.abspath(sys.argv[0]))
+    basedir = os.path.abspath(os.path.join(currentdir, '..'))
+    # The package path should be relative to the base directory.
+    if os.path.exists(os.path.join(basedir, 'lib', 'python')):
+        pythonpath = os.path.join(basedir, 'lib', 'python')
+    else:
+        pythonpath = basedir
+    sys.path.insert(0, pythonpath)  # Place PyBridge package in PYTHONPATH.
 
-# Find the Python module path, relative to the base directory.
-if os.path.exists(os.path.join(basedir, 'lib')):
-    pythonpath = os.path.join(basedir, 'lib', 'python%d.%d' % PYTHON_VERSION, 'site-packages')
-else:
-    pythonpath = basedir
 
-sys.path.insert(0, pythonpath)
-
-
 import pybridge.ui
 pybridge.ui.run()
 

Modified: trunk/pybridge/bin/pybridge-server
===================================================================
--- trunk/pybridge/bin/pybridge-server	2006-08-14 20:12:33 UTC (rev 336)
+++ trunk/pybridge/bin/pybridge-server	2006-08-15 15:02:10 UTC (rev 337)
@@ -41,6 +41,18 @@
         print "\nError: %s" % error
         sys.exit(2)
     
+    try:  # If PyBridge is installed system-wide, this finds it automatically.
+        import pybridge
+    except ImportError:  # Locate the PyBridge package.
+        currentdir = os.path.dirname(os.path.abspath(sys.argv[0]))
+        basedir = os.path.abspath(os.path.join(currentdir, '..'))
+        # The package path should be relative to the base directory.
+        if os.path.exists(os.path.join(basedir, 'lib', 'python')):
+            pythonpath = os.path.join(basedir, 'lib', 'python')
+        else:
+            pythonpath = basedir
+        sys.path.insert(0, pythonpath)  # Place PyBridge package in PYTHONPATH.
+    
     for opt, arg in opts:
         if opt in ('-h', '--help'):
             usage()
@@ -53,30 +65,16 @@
                 print "\nError: invalid value %s specified for %s" % (arg, opt)
                 sys.exit(2)
         elif opt in ('-v', '--version'):
-            import pybridge
             print "PyBridge Server version %s" % pybridge.__version__
             sys.exit(0)
     
-    # Determine the base directory.
-    currentdir = os.path.dirname(os.path.abspath(sys.argv[0]))
-    basedir = os.path.abspath(os.path.join(currentdir, '..'))
-    
-    # Find the Python module path, relative to the base directory.
-    if os.path.exists(os.path.join(basedir, 'lib')):
-        pythonver = 'python%d.%d' % sys.version_info[:2]
-        pythonpath = os.path.join(basedir, 'lib', pythonver, 'site-packages')
-    else:
-        pythonpath = basedir
-    
-    sys.path.insert(0, pythonpath)
-    
     from twisted.internet import reactor
     from twisted.python import log
     from pybridge.server import factory
     
     # TODO: replace with a service.
     log.startLogging(sys.stdout)  # Log to stdout.
-    reactor.listenTCP(PORT, factory)  # Default PyBridge port.
+    reactor.listenTCP(PORT, factory)
     reactor.run()
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.