Merge trunk r128097 and r128098. Windows lock/pid file fixes

doc/CHANGES.rst

@@ -14,6 +14,10 @@ http://docs.zope.org/zope2/releases/.
 
   - tempstorage = 2.12.2
 
+- Fix lock and pid file handling on Windows.  On other platforms
+  starting Zope tolerated existing or locked files, this now also
+  works on Windows.
+
 2.13.18 (2012-09-18)
 --------------------
 

src/Zope2/Startup/__init__.py

@@ -292,7 +292,7 @@ class ZopeStarter:
                 f = open(self.cfg.pid_filename, 'w')
                 f.write(str(os.getpid()))
                 f.close()
-            except IOError:
+            except (IOError, WindowsError):
                 pass
 
     def unlinkPidFile(self):