[Buildbot-commits] buildbot/buildbot __init__.py, 1.28, 1.29 interfaces.py, 1.56, 1.57 master.py, 1.107, 1.108

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8094/buildbot

Modified Files:
	__init__.py interfaces.py master.py 
Log Message:
[project @ bring import statements up-to-date, remove spurious shebang lines]

Original author: warner at lothar.com
Date: 2007-08-01 23:59:37+00:00

Index: __init__.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/__init__.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- __init__.py	11 Dec 2006 08:12:21 -0000	1.28
+++ __init__.py	2 Aug 2007 00:07:17 -0000	1.29
@@ -1,3 +1,2 @@
-#! /usr/bin/python
 
 version = "0.7.5+"

Index: interfaces.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/interfaces.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- interfaces.py	1 Aug 2007 23:42:27 -0000	1.56
+++ interfaces.py	2 Aug 2007 00:07:17 -0000	1.57
@@ -1,4 +1,3 @@
-#! /usr/bin/python
 
 """Interface documentation.
 

Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- master.py	1 Aug 2007 20:31:26 -0000	1.107
+++ master.py	2 Aug 2007 00:07:17 -0000	1.108
@@ -6,11 +6,7 @@
     import signal
 except ImportError:
     pass
-try:
-    import cPickle
-    pickle = cPickle
-except ImportError:
-    import pickle
+from cPickle import load
 import warnings
 
 from zope.interface import implements
@@ -586,7 +582,7 @@
     def loadChanges(self):
         filename = os.path.join(self.basedir, "changes.pck")
         try:
-            changes = pickle.load(open(filename, "rb"))
+            changes = load(open(filename, "rb"))
             styles.doUpgrade()
         except IOError:
             log.msg("changes.pck missing, using new one")