[z3-checkins] r18697 - z3/sqlos/branch/andres-sqlobject0.7

[andres at codespeak.net]

Author: andres
Date: Mon Oct 17 10:04:08 2005
New Revision: 18697

Removed:
   z3/sqlos/branch/andres-sqlobject0.7/utils.py
Modified:
   z3/sqlos/branch/andres-sqlobject0.7/configure.zcml
   z3/sqlos/branch/andres-sqlobject0.7/ftesting.zcml
Log:
Merged with trunk.

Modified: z3/sqlos/branch/andres-sqlobject0.7/configure.zcml
==============================================================================
--- z3/sqlos/branch/andres-sqlobject0.7/configure.zcml	(original)
+++ z3/sqlos/branch/andres-sqlobject0.7/configure.zcml	Mon Oct 17 10:04:08 2005
@@ -136,14 +136,14 @@
     For now, you need to change the factory here if you want
     to use a diferent connection type.
     XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
+-->  
   <adapter
       provides=".interfaces.IZopeSQLConnection"
       for="zope.app.rdb.interfaces.IZopeConnection"
       permission="zope.Public"
       factory=".adapter.PostgresAdapter"
       />
--->  
+
 
   <adapter
       provides="zope.app.container.interfaces.INameChooser"

Modified: z3/sqlos/branch/andres-sqlobject0.7/ftesting.zcml
==============================================================================
--- z3/sqlos/branch/andres-sqlobject0.7/ftesting.zcml	(original)
+++ z3/sqlos/branch/andres-sqlobject0.7/ftesting.zcml	Mon Oct 17 10:04:08 2005
@@ -31,11 +31,11 @@
       dsn='dbi://testuser:testuser@localhost:5432/testdb'
       />
 
-  <rdb:provideConnection
+  <!--<rdb:provideConnection
       name='mysql'
       component='mysqldbda.adapter.MySQLdbAdapter'
       dsn='dbi://testuser:testuser@localhost:3306/testdb'
-      />
+      />-->
 
   <sqlos:factory
       id="Dog"

Deleted: /z3/sqlos/branch/andres-sqlobject0.7/utils.py
==============================================================================
--- /z3/sqlos/branch/andres-sqlobject0.7/utils.py	Mon Oct 17 10:04:08 2005
+++ (empty file)
@@ -1,20 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Enfold Systems LLC. All rights reserved.
-#
-# This software is distributed under the terms of the Zope Public
-# License (ZPL) v2.1. See COPYING.txt for more information.
-#
-##############################################################################
-"""
-$Id$
-"""
-
-# XXX - grep shows that this function is not used at all in sqlos, perhaps we
-# should just get rid of this module - jinty
-from zope.app.location import LocationProxy
-from zope.schema.vocabulary import SimpleVocabulary
-
-def fromItems(items, context):
-    vocab = SimpleVocabulary.fromItems(items)
-    return LocationProxy(vocab, context, None)