[Buildbot-commits] buildbot/buildbot/scripts runner.py,1.19,1.20

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9505/buildbot/scripts

Modified Files:
	runner.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-149
Creator:  Brian Warner <warner at monolith.lothar.com>

make 'buildbot start' handle twisted-1.3.0 on windows

* buildbot/scripts/runner.py (start): Twisted-1.3.0 used a different name for
  the internal twistw module, handle it.


Index: runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/runner.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- runner.py	6 May 2005 05:01:11 -0000	1.19
+++ runner.py	10 May 2005 22:22:33 -0000	1.20
@@ -273,9 +273,13 @@
             argv.append("--reactor=win32")
         sys.argv = argv
 
-        # this is copied from bin/twistd
+        # this is copied from bin/twistd. twisted-1.3.0 uses twistw, while
+        # twisted-2.0.0 uses _twistw.
         if platformType == "win32":
-            from twisted.scripts._twistw import run
+            try:
+                from twisted.scripts._twistw import run
+            except ImportError:
+                from twisted.scripts.twistw import run
         else:
             from twisted.scripts.twistd import run
         run()