Changeset 1113

Timestamp:

17.07.2010 22:41:53 (19 months ago)

Author:

zmsdev

Message:

Added support for Zope-2.13.0a2.

Location:

ZMS/trunk

Files:

• ZMSMetaobjManager.py (modified) (2 diffs)
• _filtermanager.py (modified) (1 diff)
• _mediadb.py (modified) (2 diffs)
• version.txt (modified) (1 diff)
• zmssqldb.py (modified) (1 diff)

ZMS/trunk/ZMSMetaobjManager.py

@@ -29 +29 @@
 from Products.PageTemplates import ZopePageTemplate
 from Products.PythonScripts import PythonScript
-from Products.ZSQLMethods import SQL
 from cStringIO import StringIO
 import ZPublisher.HTTPRequest
@@ -856 +855 @@
             PythonScript.manage_addPythonScript( container, newObId)
           elif newType == 'Z SQL Method':
-            connection_id = self.SQLConnectionIDs()[0][0]
-            arguments = ''
-            template = ''
-            SQL.manage_addZSQLMethod( container, newObId, newName, connection_id, arguments, template)
+            try:
+              from Products.ZSQLMethods import SQL
+              connection_id = self.SQLConnectionIDs()[0][0]
+              arguments = ''
+              template = ''
+              SQL.manage_addZSQLMethod( container, newObId, newName, connection_id, arguments, template)
+            except:
+              pass
         # Rename Zope-Object.
         elif oldId != newId:

ZMS/trunk/_filtermanager.py

@@ -29 +29 @@
 from Products.PageTemplates import ZopePageTemplate
 from Products.PythonScripts import PythonScript
-from Products.ZSQLMethods import SQL
 import ZPublisher.HTTPRequest
 import copy

ZMS/trunk/_mediadb.py

@@ -28 +28 @@
 import OFS.SimpleItem
 import Acquisition
-import AccessControl.Role
 import os
 import urllib
@@ -208 +207 @@
     Persistent,
     Acquisition.Implicit,
-    AccessControl.Role.RoleManager
     ): 
 

ZMS/trunk/version.txt

@@ -1 @@
-ZMS2 2.12.1.REV
+ZMS2 2.13.0a2.REV

ZMS/trunk/zmssqldb.py

@@ -25 +25 @@
 from __future__ import nested_scopes
 from App.special_dtml import HTMLFile
-from Products.ZSQLMethods.SQL import SQLConnectionIDs
 import copy
 import os