Changeset 632

Timestamp:

07/12/13 13:41:24 (11 years ago)

Author:

bas

Message:

Added virtual env support for delete_spam

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• delete_spam.py.in (modified) (5 diffs)

trunk/ChangeLog

@@ +1 @@
+2.X.X
+  * Also made delete_spam virtual env aware
+    Fixed by: Bas van der Vlies
+
 2.7.0
   * use self.env.get_read_db for trac version > 0.11. self.env.get_db_cnx is obsolete. TRAC

trunk/delete_spam.py.in

@@ -42 +42 @@
 import shutil
 import ConfigParser
-
-from trac import __version__ as trac_version
 
 def ReadConfig(file, name):
@@ -122 +120 @@
     #
     configfile = '@email2trac_conf@'
+    virtualenv = '@virtualenv@'
+
 
 
@@ -148 +148 @@
             VERBOSE = True
 
+
+    if virtualenv and os.path.exists(virtualenv):
+        activate_this = os.path.join(virtualenv, 'bin/activate_this.py')
+        if os.path.exists(activate_this):
+            execfile(activate_this, dict(__file__=activate_this))
+
+
+    try:
+        from trac import __version__ as trac_version
+        from trac import config as trac_config
+        from trac.env import Environment
+        from trac.ticket import Ticket
+        from trac import util
+
+    except ImportError, detail:
+        print "Can not find a a valid trac installation, solutions could be:"
+        print "\tset PYTHONPATH"
+        print "\tuse the --virtualenv <dir> option"
+        sys.exit(1) 
+
     # Determine major trac version used to be in email2trac.conf
     # Quick hack for 0.12
     #
-    version = '0.%s' %(trac_version.split('.')[1])
-    if version.startswith('0.12'):
-        version = '0.12'
+    l = trac_version.split('.')
+    version = '.'.join(l[0:2])
 
     if VERBOSE:
@@ -160 +179 @@
     ## We only support versions 0.11 and 0.12
     #
-    if not version in ['0.11', '0.12']:
+    if not version in ['0.11', '0.12', '1.0', '1,1']:
         print 'Trac version %s is not suported' %(version)
 
@@ -172 +191 @@
     settings['VERBOSE'] = VERBOSE
 
-    from trac.env import Environment
-    from trac.ticket import Ticket
-    from trac import util
-
-
-
     new_delete_spam(settings)