Changeset 792

Timestamp:

16.11.2009 15:43:14 (2 years ago)

Author:

cmeier

Message:

zms-2.12.0-01

Location:

ZMS/trunk

Files:

• ZMSGlobals.py (modified) (2 diffs)
• _confmanager.py (modified) (2 diffs)
• _zcatalogmanager.py (modified) (2 diffs)
• changes.txt (modified) (2 diffs)
• version.txt (modified) (1 diff)

ZMS/trunk/ZMSGlobals.py

@@ -34 +34 @@
 import base64
 import copy
-import md5
 import operator
 import os
@@ -52 +51 @@
 __all__= ['ZMSGlobals']
 
-
 # ------------------------------------------------------------------------------
 #  MD5:
 # ------------------------------------------------------------------------------
-class MD5DigestScheme:
+try: # Python >= 2.5
+  import hashlib
+
+  class MD5DigestScheme:
 
     def encrypt(self, pw):
-        enc = md5.new(pw)
-        enc = enc.hexdigest()
-        return enc
+      enc = hashlib.md5(pw)
+      enc = enc.hexdigest()
+      return enc
 
     def validate(self, reference, attempt):
-        compare = self.encrypt(attempt)[:-1]
-        return (compare == reference)
+      compare = self.encrypt(attempt)[:-1]
+      return (compare == reference)
+
+except: # Python < 2.5
+  import md5
+
+  class MD5DigestScheme:
+
+    def encrypt(self, pw):
+      enc = md5.new(pw)
+      enc = enc.hexdigest()
+      return enc
+
+    def validate(self, reference, attempt):
+      compare = self.encrypt(attempt)[:-1]
+      return (compare == reference)
 
 AuthEncoding.registerScheme('MD5', MD5DigestScheme())

ZMS/trunk/_confmanager.py

@@ -214 +214 @@
         conf = open( filepaths[1]+'configure.zcml','r')
       conf_xml = self.xmlParse( conf)
-      print "conf_xml=",conf_xml
       for source in self.xmlNodeSet(conf_xml,'source'):
         location = source['attrs']['location']
-        print "location=",location
         if location.startswith('http://'):
           try:
@@ -230 +228 @@
         else:
           for filepath in filepaths:
-            for filename in os.listdir(filepath+location):
-              path = filepath + filename
-              mode = os.stat(path)[stat.ST_MODE]
-              if not stat.S_ISDIR(mode):
-                if filename not in filenames:
-                  filenames[path] = filename
+            if os.path.exists( filepath):
+              for filename in os.listdir(filepath+location):
+                path = filepath + filename
+                mode = os.stat(path)[stat.ST_MODE]
+                if not stat.S_ISDIR(mode):
+                  if filename not in filenames:
+                    filenames[path] = filename
       conf.close()
       # Filter.

ZMS/trunk/_zcatalogmanager.py

@@ -88 +88 @@
   # return quoted search string.
   return s
-
-# ------------------------------------------------------------------------------
-#  _zcatalogmanager.addVocabulary:
-# ------------------------------------------------------------------------------
-def addVocabulary( self, cat):
-  from Products.ZCatalog import Vocabulary
-  
-  #-- Remove Default-Vocabulary
-  ids = cat.objectIds( ['Vocabulary'])
-  if len( ids) > 0:
-    cat.manage_delObjects( ids)
-  
-  #-- Add ISO 8859-1 Vocabulary
-  # see ZCatalogs with Umlauts
-  # http://www.zope.org/Members/strobl/HowTos/Iszcatalog
-  globbing = 1
-  splitter = "ISO_8859_1_Splitter"
-  voc = Vocabulary.Vocabulary( "Vocabulary", "Default vocabulary", globbing, splitter)
-  cat._setObject( voc.id, voc)
 
 # ------------------------------------------------------------------------------
@@ -523 +504 @@
       else:
         zcatalog = obs[ 0]
-      
-      #-- Add vocabulary
-      addVocabulary( self, zcatalog)
       
       #-- Add lexicon

ZMS/trunk/changes.txt

@@ -1371 +1371 @@
 [01271] Increased col-size threshold for string -> text in SQL-Datasource from 50 to 128 (requested by fh).
 --------------------------------------------------
-2009-10-19:zms-2.11.4-02
+2009-10-25:zms-2.11.4-02
 [01271] Revised imports from Globals with respect for deprecation warnings in Zope2-2.12.0.
 [01272] Removed webdav-support for compatibility with Zope2-2.12.0.
@@ -1378 +1378 @@
 [01275] Added support for overwriting configuration of $ZMS_HOME/import/configure.zcml by $INSTANCE_HOME/etc/zms/import/configure.zcml(requested by xm).
 --------------------------------------------------
+2009-10-26:zms2-2.12.0-01
+[01276] Added support for Zope2-2.12.0 / Python-2.6.3.
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++++ IMPORTANT NOTE: ZMS will remain compliant with Zope-2.10.x / Python-2.4 until further notice!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+--------------------------------------------------

ZMS/trunk/version.txt

@@ -1 @@
-ZMS 2.11.4-02
+ZMS2 2.12.0-01