diff options
author | Alfredo Tupone <tupone@gentoo.org> | 2008-07-08 06:30:52 +0000 |
---|---|---|
committer | Alfredo Tupone <tupone@gentoo.org> | 2008-07-08 06:30:52 +0000 |
commit | b9220a1344122a8081a23ba864d3bd41c922694a (patch) | |
tree | 5330e1b194a28b54485a391a65d4b59b8fafd0f7 /net-zope/zope/files | |
parent | stable x86, bug 229953 (diff) | |
download | gentoo-2-b9220a1344122a8081a23ba864d3bd41c922694a.tar.gz gentoo-2-b9220a1344122a8081a23ba864d3bd41c922694a.tar.bz2 gentoo-2-b9220a1344122a8081a23ba864d3bd41c922694a.zip |
Dropped old zope versions depending on python-2.3. Bug #222037
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-zope/zope/files')
-rw-r--r-- | net-zope/zope/files/2.6.4/zope.confd | 77 | ||||
-rw-r--r-- | net-zope/zope/files/2.6.4/zope.initd | 178 | ||||
-rw-r--r-- | net-zope/zope/files/2.7.7/i18n-1.0.0.patch | 176 | ||||
-rw-r--r-- | net-zope/zope/files/2.7.8/i18n-1.0.0.patch | 176 |
4 files changed, 0 insertions, 607 deletions
diff --git a/net-zope/zope/files/2.6.4/zope.confd b/net-zope/zope/files/2.6.4/zope.confd deleted file mode 100644 index 58204174555c..000000000000 --- a/net-zope/zope/files/2.6.4/zope.confd +++ /dev/null @@ -1,77 +0,0 @@ -#-- startup options - -#ZOPE_OPTS= - -#-- Zope installation - -#INSTANCE_HOME= -#SOFTWARE_HOME= -#ZOPE_HOME= -#FORCE_PRODUCT_LOAD= - -#-- Profiling - -#PROFILE_PUBLISHER= - -#-- SiteAccess - -#SUPPRESS_ACCESSRULE= -#SUPPRESS_SITEROOT= - -#-- ZEO - -#CLIENT_HOME= -#ZEO_CLIENT= - -#-- Debugging and Logging - -#EVENT_LOG_FORMAT= -#EVENT_LOG_FILE= -#EVENT_LOG_SEVERITY= -#ZSYSLOG= -#ZSYSLOG_FACILITY= -#ZSYSLOG_SERVER= -#ZSYSLOG_ACCESS= -#ZSYSLOG_ACCESS_FACILITY= -#ZSYSLOG_ACCESS_SERVER= -#Z_DEBUG_MODE= - -#-- Misc. - -#Z_REALM - -#-- Security related - -#NO_SECURITY= -#ZOPE_SECURITY_POLICY= -#ZSP_OWNEROUS_SKIP= -#ZSP_AUTHENTICATED_SKIP= -#DISALLOW_LOCAL_PRODUCTS= - -#-- ZODB related - -#ZOPE_DATABASE_QUOTA= -#ZOPE_READ_ONLY= - -#-- Session related - -#ZSESSION_ADD_NOTIFY= -#ZSESSION_DEL_NOTIFY= -#ZSESSION_TIMEOUT_MINS= -#ZSESSION_OBJECT_LIMIT= - -#-- WebDAV - -#WEBDAV_SOURCE_PORT_CLIENTS= - -#-- Structured Text - -#STX_DEFAULT_LEVEL= - -#-- DTML - -#ZOPE_DTML_REQUEST_AUTOQUOTE= - -#-- Esoteric - -#Z_MAX_STACK_SIZE= diff --git a/net-zope/zope/files/2.6.4/zope.initd b/net-zope/zope/files/2.6.4/zope.initd deleted file mode 100644 index 8e41b197e06f..000000000000 --- a/net-zope/zope/files/2.6.4/zope.initd +++ /dev/null @@ -1,178 +0,0 @@ -#!/sbin/runscript -# Zope rc-script for Gentoo Linux -# Copyright 2002-2003 by Jason Shoemaker -# Distributed under the terms of the GNU General Public License, v2 or later. -# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.6.4/zope.initd,v 1.3 2004/07/18 04:31:00 dragonheart Exp $ - -python= - -depend() -{ - need net -} - -# Since zope doesn't delete its .pid file when done, we have to determine its -# status. Zope can be shutdown from a browser...this bypasses init.d. - -# Need to export these conf.d variables so that (env) can use them - -setup_exports() -{ -local EXPORT_LST="INSTANCE_HOME SOFTWARE_HOME ZOPE_HOME FORCE_PRODUCT_LOAD \ -PROFILE_PUBLISHER SUPPRESS_ACCESSRULE SUPPRESS_SITEROOT CLIENT_HOME \ -ZEO_CLIENT EVENT_LOG_FORMAT EVENT_LOG_FILE EVENT_LOG_SEVERITY ZSYSLOG \ -ZSYSLOG_FACILITY ZSYSLOG_SERVER ZSYSLOG_ACCESS ZSYSLOG_ACCESS_FACILITY \ -ZSYSLOG_ACCESS_SERVER Z_DEBUG_MODE Z_REALM NO_SECURITY ZOPE_SECURITY_POLICY \ -ZSP_OWNEROUS_SKIP ZSP_AUTHENTICATED_SKIP DISALLOW_LOCAL_PRODUCTS \ -ZOPE_DATABASE_QUOTA ZOPE_READ_ONLY ZSESSION_ADD_NOTIFY ZSESSION_DEL_NOTIFY \ -ZSESSION_TIMEOUT_MINS ZSESSION_OBJECT_LIMIT WEBDAV_SOURCE_PORT_CLIENTS \ -STX_DEFAULT_LEVEL ZOPE_DTML_REQUEST_AUTOQUOTE Z_MAX_STACK_SIZE \ -FORCE_PRODUCT_RELOAD" - -for N in $EXPORT_LST ; do - if [ -n "${N}" ] ; then export ${N} ; fi -done -} - -# Check if the file exist. then send file to stdout. -# Parameters: -# $1 = /path/to/pid.file -# Outputs: - -read_pid() -{ - if [ -f "${1}" ] ; then - cat ${1} - fi -} - -# Check if we have a living PID, if not delete the PID FILE -# Parameters: -# $1 = /path/to/pid.file -# Returns: -# 0 if alive pid file remains -# 1 if dead pid file removed -# 2 if no pid file found - -check_pid_status() -{ - local RESULT=2 # assume no pid file will be found - local PID=$(read_pid ${1}) - - if [ -n "${PID}" ] ; then - ps --no-headers ${PID} > /dev/null 2>&1 - if [ "${?}" -eq 0 ] ; then - RESULT=0 - else - rm -f ${1} - RESULT=1 - fi - fi - - return ${RESULT} -} - -# Parameters: -# None -# Returns: -# 0 true -# 1 false and echos /pathname/to/pid/file - -is_zope_dead() -{ - local RESULT= - - if [ -n "${INSTANCE_HOME}" ] ; then - loc=${INSTANCE_HOME} - else - loc=${ZOPE_HOME} - fi - - check_pid_status ${loc}/var/Z2.pid - RESULT=${?} - if [ "${RESULT}" -eq 0 ] ; then - echo "${loc}" - RESULT=10 - break # found a live pid - fi - - if [ "${RESULT}" -eq 10 ] ; then - RESULT=1 - else - RESULT=0 - fi - - return ${RESULT} -} - -status() -{ - - if is_zope_dead ; then - eerror "--> Zope is dead." - else - einfo "--> Zope is alive." - fi - - return ${?} -} - -# If Zope is dead, remove PID file and start zope. -# The idea with 'env' is that a environment snapshot -# (current vars + /etc/conf.d/zope?) is created for zope to use. - -start_zope() -{ - local RESULT= - - is_zope_dead >/dev/null - RESULT=${?} - if [ "${RESULT}" -eq 0 ] ; then - setup_exports - umask 077 # Recommended by Zope - # "normal" logfile: e.g. /var/log/zope/zope-2_6_4, - # startup log: /var/log/zope/zope-2_6_4.log - env /usr/bin/${python} ${ZOPE_HOME}z2.py ${ZOPE_OPTS} > \ - ${EVENT_LOG_FILE}.log 2>&1 & - RESULT=${?} - else - echo 'Zope is running independant of RC management.' - echo 'We are going to try and kill it.' - stop_zope - if [ "${?}" -eq 0 ] ; then - echo 'Successfully killed zope. Try to start zope again' - fi - fi - - return ${RESULT} -} - -# If Zope is alive, kill it. - -stop_zope() -{ - local PID=$(is_zope_dead) - - if [ -n "${PID}" ] ; then - kill $(cat ${PID}/var/Z2.pid) # Not sure if kill always succeeds, so not removeing .pid file. - fi - return $? -} - -# - -start() -{ - ebegin "Starting zope" - start_zope - eend $? "Failed to start zope" -} - -# - -stop() -{ - ebegin "Stopping zope" - stop_zope - eend $? "Failed to stop zope" -} 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 deleted file mode 100644 index f901451fce0c..000000000000 --- a/net-zope/zope/files/2.7.7/i18n-1.0.0.patch +++ /dev/null @@ -1,176 +0,0 @@ -? 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() diff --git a/net-zope/zope/files/2.7.8/i18n-1.0.0.patch b/net-zope/zope/files/2.7.8/i18n-1.0.0.patch deleted file mode 100644 index f901451fce0c..000000000000 --- a/net-zope/zope/files/2.7.8/i18n-1.0.0.patch +++ /dev/null @@ -1,176 +0,0 @@ -? 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() |