[Pytrainer-svn] SF.net SVN: pytrainer:[713] pytrainer/trunk

[<dg...@us...>]

Revision: 713
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=713&view=rev
Author:   dgranda
Date:     2010-11-16 16:42:27 +0000 (Tue, 16 Nov 2010)

Log Message:
-----------
Added alternative paths to start from sources - thx to Martin. Updated revision

Modified Paths:
--------------
    pytrainer/trunk/bin/pytrainer
    pytrainer/trunk/pytrainer/main.py

Modified: pytrainer/trunk/bin/pytrainer
===================================================================
--- pytrainer/trunk/bin/pytrainer	2010-11-16 16:39:39 UTC (rev 712)
+++ pytrainer/trunk/bin/pytrainer	2010-11-16 16:42:27 UTC (rev 713)
@@ -17,12 +17,10 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-import locale
 import gettext
 import sys
 import pygtk
 pygtk.require('2.0')
-import gtk
 import gtk.glade
 import os
 import glob
@@ -66,19 +64,29 @@
 bin_path = os.path.realpath(os.path.dirname(__file__)) # directory that the pytrainer script executes from e.g. /usr/bin or /usr/local/bin
 base_path = os.path.dirname(bin_path) 
 
-data_path = base_path + "/share/pytrainer/"
-site_path = base_path + "/lib/python2.6/site-packages"
-DIR = base_path + "/share/locale"
+if (os.path.exists(base_path + "/INSTALL") 
+    and os.path.exists(base_path + "/setup.py") 
+    and os.path.exists(base_path + "/pytrainer/main.py")
+    and os.path.exists(base_path + "/locale")):
+    print("running pytrainer from source path")
+    data_path = base_path + "/"
+    site_path = base_path
+    gettext_path = base_path + "/locale"
+else:
+    print("running pytrainer from egg installation")
+    data_path = base_path + "/share/pytrainer/"
+    site_path = base_path + "/lib/python2.6/site-packages"
+    gettext_path = base_path + "/share/locale"
 
 print "data_path: " + data_path
-print "DIR: " + DIR
+print "gettext_path: " + gettext_path
 print "site_path: " + site_path
 
-gettext.bindtextdomain("pytrainer", DIR)
-gtk.glade.bindtextdomain("pytrainer", DIR)
+gettext.bindtextdomain("pytrainer", gettext_path)
+gtk.glade.bindtextdomain("pytrainer", gettext_path)
 gtk.glade.textdomain("pytrainer")
 gettext.textdomain("pytrainer")
-gettext.install("pytrainer",DIR,unicode=1)
+gettext.install("pytrainer", gettext_path, unicode=1)
 
 #ensure pytrainer directory is included in import path
 sys.path.insert(0, site_path)
@@ -101,10 +109,11 @@
     xul_env = max_version
 
 print "Using xulrunner dir: %s" % xul_env
-os.environ['MOZILLA_FIVE_HOME']=xul_env
+os.environ['MOZILLA_FIVE_HOME'] = xul_env
 
-def main(argv):
+def main():
     pytrainer = pyTrainer(None, data_path)
 
 if __name__ == "__main__":
-        main(sys.argv[1:])
+        main()
+

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2010-11-16 16:39:39 UTC (rev 712)
+++ pytrainer/trunk/pytrainer/main.py	2010-11-16 16:42:27 UTC (rev 713)
@@ -53,7 +53,7 @@
 class pyTrainer:
     def __init__(self,filename = None, data_path = None):
         #Version constants
-        self.version ="1.7.2_svn#705"
+        self.version ="1.7.2_svn#713"
         self.DB_version = 6
         #Process command line options
         self.startup_options = self.get_options()


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