fix for #103590 - sorry, files were not checked in

Package-Manager: portage-2.0.51.22-r2

3 files changed, 183 insertions, 2 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 69a451ab6683..27f872157573 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-zope/zope
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.71 2005/08/23 19:48:57 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.72 2005/08/25 12:39:03 batlogg Exp $
+
+  25 Aug 2005; Jodok Batlogg <batlogg@gentoo.org>;
+  +files/2.7.7/i18n-1.0.0.patch:
+  fix for #103590 - sorry, files were not checked in
 
 *zope-2.8.1 (23 Aug 2005)
 
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 0bfdb10b9b6a..30e6d96cca47 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -3,7 +3,7 @@ MD5 42625ed029875b4d13c9af34f02aa7ed zope-2.7.5.ebuild 3334
 MD5 5416407eff85546578bb4e7c61f45d5e zope-2.6.4-r1.ebuild 5629
 MD5 7b10f9f85f1772dea3cac8f774d8d6ea zope-2.7.7.ebuild 3334
 MD5 03dd7525a3392e245889fba308edc438 zope-2.8.0.ebuild 3362
-MD5 f4fd9f744e7b207023729158bf2f9155 ChangeLog 12051
+MD5 8e1b37fa0f03aadc056193b8096d18f5 ChangeLog 12189
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 0a5e41adc4e26168061146ca2697ebf0 zope-2.7.2-r2.ebuild 3214
 MD5 e3ebbd463da7c5b7f7cacd4d79323c46 zope-2.7.6.ebuild 3335
@@ -22,3 +22,4 @@ MD5 e99b9fc903db808c1bbb5aa8b9d0b44f files/2.7.2/zope.initd 1169
 MD5 bce3b7d98963ff6f3e3d53557f3b4912 files/2.7.2/gid.patch 460
 MD5 c97d6dc27b456ae0fbfdf8ee5627ac1b files/2.7.4/i18n-1.0.0.patch 7630
 MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.6/i18n-1.0.0.patch 7634
+MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.7/i18n-1.0.0.patch 7634
diff --git a/net-zope/zope/files/2.7.7/i18n-1.0.0.patch b/net-zope/zope/files/2.7.7/i18n-1.0.0.patch
new file mode 100644
index 000000000000..f901451fce0c
--- /dev/null
+++ b/net-zope/zope/files/2.7.7/i18n-1.0.0.patch
@@ -0,0 +1,176 @@
+? encode.diff
+? i18n-0.9.9.patch
+? i18n-1.0.0.patch
+? i18n.patch
+? run_tests
+? test.diff
+Index: ClassicStructuredText.py
+===================================================================
+RCS file: /var/lib/cvs/nkm/zope/StructuredText/ClassicStructuredText.py,v
+retrieving revision 1.1.1.2
+retrieving revision 1.1.1.1.2.1
+diff -u -r1.1.1.2 -r1.1.1.1.2.1
+Index: DocumentClass.py
+===================================================================
+RCS file: /var/lib/cvs/nkm/zope/StructuredText/DocumentClass.py,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 DocumentClass.py
+--- DocumentClass.py	15 Apr 2003 15:13:52 -0000	1.1.1.1
++++ DocumentClass.py	9 Nov 2003 18:02:30 -0000
+@@ -789,7 +789,7 @@
+ 
+     def doc_literal(
+         self, s,
+-        expr = re.compile(r"(\W+|^)'([%s%s%s\s]+)'([%s]+|$)" % (letters, digits, literal_punc, phrase_delimiters)).search,):
++        expr = re.compile(r"(\W+|^)'((?:\w|[%s%s\s])+)'([%s]+|$)" % (digits, literal_punc, phrase_delimiters), re.U).search,):
+ 
+         # old expr... failed to cross newlines.
+         #        expr=re.compile(
+@@ -807,7 +807,9 @@
+ 
+     def doc_emphasize(
+         self, s,
+-        expr = re.compile(r'\*([%s%s%s\s]+?)\*' % (letters, digits, strongem_punc)).search
++        # i18nal variant
++        expr = re.compile(r'\*((?:\w|[%s\s])+?)\*' % (strongem_punc), re.U).search
++        #expr = re.compile(r'\*([%s%s%s\s]+?)\*' % (letters, digits, strongem_punc)).search
+         #expr = re.compile(r'\s*\*([ \n\r%s0-9.:/;,\'\"\?\-\_\/\=\-\>\<\(\)]+)\*(?!\*|-)' % letters).search       # old expr, inconsistent punctuation
+         ):
+ 
+@@ -853,7 +855,7 @@
+ 
+     def doc_underline(self,
+                       s,
+-                      expr=re.compile(r'_([%s%s%s\s]+)_([\s%s]|$)' % (letters, digits, under_punc,phrase_delimiters)).search):
++                      expr=re.compile(r'_((?:\w|[%s\s])+)_([\s%s]|$)' % (under_punc,phrase_delimiters), re.U).search):
+ 
+         result = expr(s)
+         if result:
+@@ -867,7 +869,7 @@
+ 
+     def doc_strong(self,
+                    s,
+-                   expr = re.compile(r'\*\*([%s%s%s\s]+?)\*\*' % (letters, digits, strongem_punc)).search
++                   expr = re.compile(r'\*\*((?:\w|[%s%s\s])+?)\*\*' % (digits, strongem_punc), re.U).search
+                    #expr = re.compile(r'\s*\*\*([ \n\r%s0-9.:/;,\'\"\?\-\_\/\=\-\>\<\(\)]+)\*\*(?!\*|-)' % letters).search, # old expr, inconsistent punc, failed to cross newlines.
+         ):
+ 
+@@ -879,7 +881,7 @@
+             return None
+ 
+     ## Some constants to make the doc_href() regex easier to read.
+-    _DQUOTEDTEXT = r'("[ %s0-9\n\r%s]+")' % (letters,dbl_quoted_punc) ## double quoted text
++    _DQUOTEDTEXT = r'("[^"]+")'
+     _ABSOLUTE_URL=r'((http|https|ftp|mailto|file|about)[:/]+?[%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
+     _ABS_AND_RELATIVE_URL=r'([%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
+ 
+@@ -887,12 +889,12 @@
+ 
+ 
+     def doc_href1(self, s,
+-                  expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES).search
++                  expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES, re.U).search
+                    ):
+         return self.doc_href(s, expr)
+ 
+     def doc_href2(self, s,
+-                  expr=re.compile(_DQUOTEDTEXT + r'(\,\s+)' + _ABSOLUTE_URL + _SPACES).search
++                  expr=re.compile(_DQUOTEDTEXT + r'(\,\s+)' + _ABSOLUTE_URL + _SPACES, re.U).search
+                    ):
+         return self.doc_href(s, expr)
+ 
+Index: DocumentWithImages.py
+===================================================================
+RCS file: /var/lib/cvs/nkm/zope/StructuredText/DocumentWithImages.py,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+--- DocumentWithImages.py       2005-01-14 21:34:31.789944304 +0100
++++ DocumentWithImages.py       2005-01-14 21:33:58.362026120 +0100
+@@ -30,7 +30,7 @@
+
+     def doc_img(
+         self, s,
+-        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9%\_\-.:/\?=;,\n\~]+)').search,
++        expr1=re.compile('\"((?:\w|[ *.:/;,\-\n\~])+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)', re.U).search,
+         ):
+
+
+Index: HTMLClass.py
+===================================================================
+RCS file: /var/lib/cvs/nkm/zope/StructuredText/HTMLClass.py,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2.2.2
+diff -u -r1.1.1.1 -r1.2.2.2
+Index: ST.py
+===================================================================
+RCS file: /var/lib/cvs/nkm/zope/StructuredText/ST.py,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -r1.1.1.1 -r1.2
+--- ST.py	15 Apr 2003 15:13:53 -0000	1.1.1.1
++++ ST.py	15 Apr 2003 15:16:25 -0000	1.2
+@@ -115,6 +115,9 @@
+     Structure => [paragraph,[sub-paragraphs]]
+     """
+ 
++    if type(paragraphs) == type(''):
++        paragraphs = unicode(paragraphs, 'utf-8')
++
+     currentlevel    = 0
+     currentindent  = 0
+     levels            = {0:0}
+Index: Zwiki.py
+===================================================================
+RCS file: /var/lib/cvs/nkm/zope/StructuredText/Zwiki.py,v
+retrieving revision 1.1.1.2
+retrieving revision 1.1.1.1.2.1
+diff -u -r1.1.1.2 -r1.1.1.1.2.1
+Index: test.py
+===================================================================
+RCS file: /var/lib/cvs/nkm/zope/StructuredText/test.py,v
+retrieving revision 1.1.1.1
+retrieving revision 1.1.2.1
+diff -u -r1.1.1.1 -r1.1.2.1
+Index: tests/__init__.py
+===================================================================
+RCS file: /var/lib/cvs/nkm/zope/StructuredText/tests/__init__.py,v
+retrieving revision 1.1.1.1
+retrieving revision 1.1.2.1
+diff -u -r1.1.1.1 -r1.1.2.1
+Index: tests/testStructuredText.py
+===================================================================
+RCS file: /var/lib/cvs/nkm/zope/StructuredText/tests/testStructuredText.py,v
+retrieving revision 1.1.1.1
+retrieving revision 1.1.1.1.2.3
+diff -u -r1.1.1.1 -r1.1.1.1.2.3
+--- tests/testStructuredText.py	15 Apr 2003 15:13:56 -0000	1.1.1.1
++++ tests/testStructuredText.py	7 Nov 2003 12:12:32 -0000	1.1.1.1.2.3
+@@ -210,13 +210,22 @@
+         '<code>"literal":http://www.zope.org/.</code>')
+ 
+ 
+-    def XXXtestUnicodeContent(self):
+-        # This fails because ST uses the default locale to get "letters"
+-        # whereas it should use \w+ and re.U if the string is Unicode.
+-        #self._test(u"h\xe9 **y\xe9** xx",
+-        #           u"h\xe9 <strong>y\xe9</strong> xx")
+-        pass
++    def testUnicodeContent(self):
++        self._test(u"h\xe9 **y\xe9** xx",
++                   u"h\xe9 <strong>y\xe9</strong> xx")
++        self._test(u"h\xe9 *y\xe9* xx",
++                   u"h\xe9 <em>y\xe9</em> xx")
++        self._test(u"h\xe9 _y\xe9_ xx",
++                   u"h\xe9 <u>y\xe9</u> xx")
++        self._test(u"h\xe9 'y\xe9' xx",
++                   u"h\xe9 <code>y\xe9</code> xx")
++        self._test(u"h\xe9 \"y\xe9\":http://zope.org xx",
++                   u"h\xe9 <a href=\"http://zope.org\">y\xe9</a> xx")
+ 
++    def testDoNotHang(self):
++        raw_str = 'UAB "Vita Baltic International" produkcijos asortiment\u0105 papild\u0117 dar trys  specifines nedegumo savybes turin\u010dios porolono ru\u0161ys. \nSpalio m\u0117nes\u012f buvo gauti tarptautiniai sertifikatai, liudijantys, kad porolonai CV 3037, CV 3538 ir CV 2533 atitinka degumo standart\u0173 BS 5852:Part 2: 1982 reikalavimus. Tai labai gera \u017einia bald\u0173 gamintojams, gaminantiems baldus ir \u010diu\u017einius,\nkuri\u0173 gaminiams keliami ypatingi importuotoj\u0173 reikalavimai.'
++        res_txt = raw_str
++        self._test(raw_str, res_txt)        
+ 
+ def test_suite():
+     suite = unittest.TestSuite()