Update of /cvsroot/monetdb/sql/src/test/BugTracker-2009/Tests
In directory 
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3321/src/test/BugTracker-2009/Tests

Modified Files:
        lost_update.SF-2790020.py 
Log Message:
propagated changes of Monday Oct 12 2009 - Tuesday Oct 13 2009
from the Nov2009 branch to the development trunk

  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  2009/10/12 - sjoerd:
          src/test/BugTracker-2009/Tests/lost_update.SF-2790020.py,1.2.4.1
  Get rid of our own copy of subprocess.py.  We now require a Python version >= 
2.4.
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: lost_update.SF-2790020.py
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lost_update.SF-2790020.py   20 May 2009 13:41:45 -0000      1.2
+++ lost_update.SF-2790020.py   13 Oct 2009 14:10:34 -0000      1.3
@@ -1,11 +1,7 @@
 import sys
 import os
 import time
-try:
-    import subprocess
-except ImportError:
-    # use private copy for old Python versions
-    import MonetDBtesting.subprocess26 as subprocess
+import subprocess
 
 def server():
     s = subprocess.Popen("%s --dbinit='include sql;'" % os.getenv('MSERVER'),


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to