[Checkins] SVN: Sandbox/adamg/ocql/trunk/s had some unnecessary imports

[Adam Groszer]

Log message for revision 87418:
  had some unnecessary imports

Changed:
  U   Sandbox/adamg/ocql/trunk/setup.py
  U   Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/aoptimizer.py
  U   Sandbox/adamg/ocql/trunk/src/ocql/parser/queryparser.py
  U   Sandbox/adamg/ocql/trunk/src/ocql/qoptimizer/qoptimizer.py

-=-
Modified: Sandbox/adamg/ocql/trunk/setup.py
===================================================================
--- Sandbox/adamg/ocql/trunk/setup.py	2008-06-15 23:19:19 UTC (rev 87417)
+++ Sandbox/adamg/ocql/trunk/setup.py	2008-06-16 06:30:02 UTC (rev 87418)
@@ -31,6 +31,7 @@
     extras_require = dict(
         test = [
             'zope.testing',
+            'zope.schema',
             ],
         ),
     install_requires = [

Modified: Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/aoptimizer.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/aoptimizer.py	2008-06-15 23:19:19 UTC (rev 87417)
+++ Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/aoptimizer.py	2008-06-16 06:30:02 UTC (rev 87418)
@@ -8,7 +8,7 @@
 
 from zope.component import adapts
 from zope.interface import implements
-from zope.security.proxy import removeSecurityProxy
+#from zope.security.proxy import removeSecurityProxy
 from zope.interface import directlyProvidedBy
 from zope.interface import directlyProvides
 
@@ -18,7 +18,7 @@
 from ocql.interfaces import IOptimizedAlgebraObject
 
 def addMarkerIF(obj, marker):
-    obj = removeSecurityProxy(obj)
+    #obj = removeSecurityProxy(obj)
     if not marker.providedBy(obj):
         directlyProvides(obj, directlyProvidedBy(obj), marker)
 

Modified: Sandbox/adamg/ocql/trunk/src/ocql/parser/queryparser.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/parser/queryparser.py	2008-06-15 23:19:19 UTC (rev 87417)
+++ Sandbox/adamg/ocql/trunk/src/ocql/parser/queryparser.py	2008-06-16 06:30:02 UTC (rev 87418)
@@ -18,7 +18,6 @@
 from zope.component import adapts
 from zope.component import provideAdapter
 from zope.interface import implements
-import zope.thread
 
 from ocql.queryobject.queryobject import *
 from ocql.interfaces import IQueryParser

Modified: Sandbox/adamg/ocql/trunk/src/ocql/qoptimizer/qoptimizer.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/qoptimizer/qoptimizer.py	2008-06-15 23:19:19 UTC (rev 87417)
+++ Sandbox/adamg/ocql/trunk/src/ocql/qoptimizer/qoptimizer.py	2008-06-16 06:30:02 UTC (rev 87418)
@@ -8,7 +8,7 @@
 
 from zope.component import adapts
 from zope.interface import implements
-from zope.security.proxy import removeSecurityProxy
+#from zope.security.proxy import removeSecurityProxy
 from zope.interface import directlyProvidedBy
 from zope.interface import directlyProvides
 
@@ -18,7 +18,7 @@
 from ocql.interfaces import IOptimizedObjectQuery
 
 def addMarkerIF(obj, marker):
-    obj = removeSecurityProxy(obj)
+    #obj = removeSecurityProxy(obj)
     if not marker.providedBy(obj):
         directlyProvides(obj, directlyProvidedBy(obj), marker)