[Checkins] SVN: zc.catalog/branches/1.3/ Stemmer fix from trunk, add versions.cfg.

[Patrick Strawderman]

Log message for revision 109912:
  Stemmer fix from trunk, add versions.cfg.

Changed:
  U   zc.catalog/branches/1.3/CHANGES.txt
  U   zc.catalog/branches/1.3/buildout.cfg
  U   zc.catalog/branches/1.3/setup.py
  U   zc.catalog/branches/1.3/src/zc/catalog/stemmer.py
  A   zc.catalog/branches/1.3/versions.cfg

-=-
Modified: zc.catalog/branches/1.3/CHANGES.txt
===================================================================
--- zc.catalog/branches/1.3/CHANGES.txt	2010-03-11 18:20:38 UTC (rev 109911)
+++ zc.catalog/branches/1.3/CHANGES.txt	2010-03-11 18:24:29 UTC (rev 109912)
@@ -5,6 +5,14 @@
 The 1.2 line (and higher) supports Zope 3.4/ZODB 3.8.  The 1.1 line supports
 Zope 3.3/ZODB 3.7.
 
+1.3.1 (2010-03-11)
+------------------
+
+* Try to import the stemmer from the zopyx.txng3.ext package first, which
+  as of 3.3.2 contains stability and memory leak fixes.
+
+* Pin versions to get tests passing without modifying zc.catalog code.
+
 1.3.0 (2008-09-10)
 ------------------
 

Modified: zc.catalog/branches/1.3/buildout.cfg
===================================================================
--- zc.catalog/branches/1.3/buildout.cfg	2010-03-11 18:20:38 UTC (rev 109911)
+++ zc.catalog/branches/1.3/buildout.cfg	2010-03-11 18:24:29 UTC (rev 109912)
@@ -2,8 +2,11 @@
 develop = .
 parts = test
 
+extends = versions.cfg
+versions = versions
+allow-picked-versions = false
+
 [test]
 recipe = zc.recipe.testrunner
 eggs = zc.catalog [test]
 defaults = "--exit-with-status".split()
-

Modified: zc.catalog/branches/1.3/setup.py
===================================================================
--- zc.catalog/branches/1.3/setup.py	2010-03-11 18:20:38 UTC (rev 109911)
+++ zc.catalog/branches/1.3/setup.py	2010-03-11 18:24:29 UTC (rev 109912)
@@ -22,7 +22,7 @@
     return open(os.path.join(os.path.dirname('.'), *rnames)).read()
 
 setup(name='zc.catalog',
-      version = '1.3.0',
+      version = '1.3.1',
       author='Zope Corporation and Contributors',
       author_email='zope3-dev at zope.org',
       description="Extensions to the Zope 3 Catalog",

Modified: zc.catalog/branches/1.3/src/zc/catalog/stemmer.py
===================================================================
--- zc.catalog/branches/1.3/src/zc/catalog/stemmer.py	2010-03-11 18:20:38 UTC (rev 109911)
+++ zc.catalog/branches/1.3/src/zc/catalog/stemmer.py	2010-03-11 18:24:29 UTC (rev 109912)
@@ -18,16 +18,19 @@
 import re
 broken = None
 try:
-    from zopyx.txng3 import stemmer
+    from zopyx.txng3.ext import stemmer
 except ImportError:
     try:
-        import txngstemmer as stemmer
+        from zopyx.txng3 import stemmer
     except ImportError:
-        stemmer = None
-        class Broken:
-            def stem(self, l):
-                return l
-        broken = Broken()
+        try:
+            import txngstemmer as stemmer
+        except ImportError:
+            stemmer = None
+            class Broken:
+                def stem(self, l):
+                    return l
+            broken = Broken()
 
 # as of this writing, trying to persist a txngstemmer.Stemmer makes the python
 # process end, only printing a "Bus error" message before quitting.  Don't do

Added: zc.catalog/branches/1.3/versions.cfg
===================================================================
--- zc.catalog/branches/1.3/versions.cfg	                        (rev 0)
+++ zc.catalog/branches/1.3/versions.cfg	2010-03-11 18:24:29 UTC (rev 109912)
@@ -0,0 +1,102 @@
+[versions]
+ClientForm = 0.2.10
+RestrictedPython = 3.5.1
+ZConfig = 2.7.1
+ZODB3 = 3.9.4
+docutils = 0.6
+mechanize = 0.1.11
+pytz = 2010e
+setuptools = 0.6c11
+transaction = 1.0.0
+zc.buildout = 1.4.3
+zc.lockfile = 1.0.0
+zc.recipe.egg = 1.2.2
+zc.recipe.testrunner = 1.2.0
+zdaemon = 2.0.4
+zodbcode = 3.4.0
+zope.annotation = 3.4.2
+zope.app.apidoc = 3.5.3
+zope.app.applicationcontrol = 3.4.3
+zope.app.appsetup = 3.8.0
+zope.app.authentication = 3.4.4
+zope.app.basicskin = 3.4.1
+zope.app.broken = 3.4.0
+zope.app.catalog = 3.5.2
+zope.app.component = 3.4.2
+zope.app.container = 3.5.6
+zope.app.content = 3.4.0
+zope.app.debug = 3.4.1
+zope.app.debugskin = 3.4.0
+zope.app.dependable = 3.4.0
+zope.app.error = 3.5.2
+zope.app.exception = 3.4.2
+zope.app.folder = 3.4.0
+zope.app.form = 3.4.2
+zope.app.generations = 3.4.2
+zope.app.http = 3.4.5
+zope.app.i18n = 3.4.6
+zope.app.interface = 3.4.0
+zope.app.intid = 3.4.1
+zope.app.keyreference = 3.6.1
+zope.app.locales = 3.4.5
+zope.app.pagetemplate = 3.4.1
+zope.app.preference = 3.4.1
+zope.app.principalannotation = 3.4.0
+zope.app.publication = 3.4.4
+zope.app.publisher = 3.5.3
+zope.app.renderer = 3.4.0
+zope.app.rotterdam = 3.4.1
+zope.app.schema = 3.4.0
+zope.app.security = 3.4.0
+zope.app.securitypolicy = 3.4.6
+zope.app.server = 3.4.2
+zope.app.session = 3.5.2
+zope.app.skins = 3.4.0
+zope.app.testing = 3.4.4
+zope.app.wsgi = 3.4.2
+zope.app.zapi = 3.4.1
+zope.app.zcmlfiles = 3.4.3
+zope.app.zopeappgenerations = 3.4.0
+zope.cachedescriptors = 3.4.1
+zope.component = 3.4.0
+zope.configuration = 3.4.1
+zope.contentprovider = 3.4.0
+zope.contenttype = 3.4.3
+zope.copy = 3.5.0
+zope.copypastemove = 3.4.1
+zope.datetime = 3.4.0
+zope.deferredimport = 3.5.0
+zope.deprecation = 3.4.0
+zope.dottedname = 3.4.6
+zope.dublincore = 3.4.3
+zope.error = 3.5.1
+zope.event = 3.4.0
+zope.exceptions = 3.4.0
+zope.filerepresentation = 3.6.0
+zope.formlib = 3.4.0
+zope.hookable = 3.4.1
+zope.i18n = 3.4.0
+zope.i18nmessageid = 3.4.3
+zope.index = 3.4.1
+zope.interface = 3.4.1
+zope.keyreference = 3.6.2
+zope.lifecycleevent = 3.4.1
+zope.location = 3.5.5
+zope.minmax = 1.1.2
+zope.modulealias = 3.4.0
+zope.pagetemplate = 3.5.0
+zope.proxy = 3.4.2
+zope.publisher = 3.5.8
+zope.schema = 3.5.4
+zope.security = 3.5.2
+zope.securitypolicy = 3.4.2
+zope.server = 3.6.1
+zope.session = 3.6.0
+zope.size = 3.4.0
+zope.structuredtext = 3.4.0
+zope.tal = 3.4.0
+zope.tales = 3.4.0
+zope.testbrowser = 3.5.0
+zope.testing = 3.6.0
+zope.thread = 3.4
+zope.traversing = 3.5.4