[Zope-Checkins] SVN: Zope/trunk/ Remove quota argument from DemoStorage calls in preparation for ZODB 3.9.

2008-11-22 Thread Stefan H. Holek 
Log message for revision 93256:
  Remove quota argument from DemoStorage calls in preparation for ZODB 3.9.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2008-11-22 01:39:02 UTC (rev 93255)
+++ Zope/trunk/doc/CHANGES.txt  2008-11-22 08:58:41 UTC (rev 93256)
@@ -219,6 +219,9 @@
 
 Bugs Fixed
 
+  - Testing.ZopeTestCase: Remove quota argument from DemoStorage calls in
+preparation for ZODB 3.9.
+
   - Ported c69896 to Five. This fix makes it possible to provide a
 template using Python, and not have it being set to `None` by
 the viewlet manager directive.

Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py  2008-11-22 
01:39:02 UTC (rev 93255)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py  2008-11-22 
08:58:41 UTC (rev 93256)
@@ -229,9 +229,7 @@
 def sandbox(base=None):
 '''Returns a sandbox copy of the base ZODB.'''
 if base is None: base = Zope2.DB
-base_storage = base._storage
-quota = getattr(base_storage, '_quota', None)
-storage = DemoStorage(base=base_storage, quota=quota)
+storage = DemoStorage(base=base._storage)
 return ZODB.DB(storage)
 
 _write(' done (%.3fs)\n' % (time.time() - _start))

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/ Remove quota argument from DemoStorage calls in preparation for ZODB 3.9.

2008-11-22 Thread Stefan H. Holek 
Log message for revision 93257:
  Remove quota argument from DemoStorage calls in preparation for ZODB 3.9.
  

Changed:
  U   Zope/branches/2.11/doc/CHANGES.txt
  U   Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py

-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===
--- Zope/branches/2.11/doc/CHANGES.txt  2008-11-22 08:58:41 UTC (rev 93256)
+++ Zope/branches/2.11/doc/CHANGES.txt  2008-11-22 08:58:59 UTC (rev 93257)
@@ -8,6 +8,9 @@
 
 Bugs Fixed
   
+  - Testing.ZopeTestCase: Remove quota argument from DemoStorage calls in
+preparation for ZODB 3.9.
+
   Zope 2.11.2 (2008/10/24) 
 
 Bugs Fixed

Modified: Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py
===
--- Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py  
2008-11-22 08:58:41 UTC (rev 93256)
+++ Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py  
2008-11-22 08:58:59 UTC (rev 93257)
@@ -229,9 +229,7 @@
 def sandbox(base=None):
 '''Returns a sandbox copy of the base ZODB.'''
 if base is None: base = Zope2.DB
-base_storage = base._storage
-quota = getattr(base_storage, '_quota', None)
-storage = DemoStorage(base=base_storage, quota=quota)
+storage = DemoStorage(base=base._storage)
 return ZODB.DB(storage)
 
 _write(' done (%.3fs)\n' % (time.time() - _start))

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/Testing/custom_zodb.py Remove quota argument.

2008-11-22 Thread Stefan H. Holek 
Log message for revision 93258:
  Remove quota argument.

Changed:
  U   Zope/trunk/lib/python/Testing/custom_zodb.py

-=-
Modified: Zope/trunk/lib/python/Testing/custom_zodb.py
===
--- Zope/trunk/lib/python/Testing/custom_zodb.py2008-11-22 08:58:59 UTC 
(rev 93257)
+++ Zope/trunk/lib/python/Testing/custom_zodb.py2008-11-22 09:24:48 UTC 
(rev 93258)
@@ -31,6 +31,6 @@
 else:
 from ZODB.DemoStorage import DemoStorage
 LOG.info('Using DemoStorage')
-return DemoStorage(quota=(120))
+return DemoStorage()
 
 Storage = getStorage()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/Testing/custom_zodb.py Remove quota argument.

2008-11-22 Thread Stefan H. Holek 
Log message for revision 93259:
  Remove quota argument.

Changed:
  U   Zope/branches/2.11/lib/python/Testing/custom_zodb.py

-=-
Modified: Zope/branches/2.11/lib/python/Testing/custom_zodb.py
===
--- Zope/branches/2.11/lib/python/Testing/custom_zodb.py2008-11-22 
09:24:48 UTC (rev 93258)
+++ Zope/branches/2.11/lib/python/Testing/custom_zodb.py2008-11-22 
09:25:08 UTC (rev 93259)
@@ -31,6 +31,6 @@
 else:
 from ZODB.DemoStorage import DemoStorage
 LOG.info('Using DemoStorage')
-return DemoStorage(quota=(120))
+return DemoStorage()
 
 Storage = getStorage()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Protect against non-existing zope.conf path and products directories. This makes it possible to run a Zope instance without a Products or lib/python directory.

2008-11-22 Thread Hanno Schlichting 
Log message for revision 93264:
  Protect against non-existing zope.conf path and products directories. This 
makes it possible to run a Zope instance without a Products or lib/python 
directory.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Zope2/Startup/handlers.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2008-11-22 20:17:26 UTC (rev 93263)
+++ Zope/trunk/doc/CHANGES.txt  2008-11-23 00:05:33 UTC (rev 93264)
@@ -9,6 +9,10 @@
 
 Restructuring
 
+  - Protect against non-existing zope.conf path and products directories.
+This makes it possible to run a Zope instance without a Products or
+lib/python directory.
+
   - updated to ZODB 3.8.1
 
   - Moved exception MountedStorageError from ZODB.POSExceptions

Modified: Zope/trunk/lib/python/Zope2/Startup/handlers.py
===
--- Zope/trunk/lib/python/Zope2/Startup/handlers.py 2008-11-22 20:17:26 UTC 
(rev 93263)
+++ Zope/trunk/lib/python/Zope2/Startup/handlers.py 2008-11-23 00:05:33 UTC 
(rev 93264)
@@ -184,10 +184,11 @@
 for k,v in config.environment.items():
 os.environ[k] = v
 
-# Add directories to the pythonpath; always insert instancehome/lib/python
+# Add directories to the pythonpath
 instancelib = os.path.join(config.instancehome, 'lib', 'python')
 if instancelib not in config.path:
-config.path.append(instancelib)
+if os.path.isdir(instancelib):
+config.path.append(instancelib)
 path = config.path[:]
 path.reverse()
 for dir in path:
@@ -195,11 +196,11 @@
 
 # Add any product directories not already in Products.__path__.
 # Directories are added in the order they are mentioned
-# Always insert instancehome.Products
 
 instanceprod = os.path.join(config.instancehome, 'Products')
 if instanceprod not in config.products:
-config.products.append(instanceprod)
+if os.path.isdir(instanceprod):
+config.products.append(instanceprod)
 
 import Products
 L = []

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins