Changeset 781 in tailor

Timestamp:

09/07/05 19:02:24 (8 years ago)

Author:

lele@…

Hash name:

20050907170224-7a6fb-949b72e3c6d9df658a5013ce0c33131759050a04

Message:

Make the cvs log parser unicode aware
Now the parser accepts an unicode stream, and returns properly decoded
informations eventually using the new 'encoding' option if specified,
otherwise using the system default.

Location:

vcpx

Files:

• cvs.py (modified) (2 diffs)
• tests/cvs.py (modified) (14 diffs)
• tests/tailor.py (modified) (1 diff)

vcpx/cvs.py

@@ -299 +299 @@
         from os.path import join, exists
         from datetime import timedelta
+
+        from codecs import getreader
 
         branch = ''
@@ -349 +351 @@
                 "%s returned status %d" % (str(cvslog), cvslog.exit_status))
 
+        reader = getreader(self.repository.encoding)
+        log = reader(log)
         return changesets_from_cvslog(log, self.repository.module)
 

vcpx/tests/cvs.py

@@ -44 +44 @@
     """Ensure the cvs log parser does its job."""
 
-    SIMPLE_TEST = """\
+    SIMPLE_TEST = u"""\
 cvs rlog: Logging docutils
 
@@ -94 +94 @@
         self.assertEqual(entry.action_kind, entry.UPDATED)
 
-    DOUBLE_TEST = """\
+    DOUBLE_TEST = u"""\
 cvs rlog: Logging docutils/docutils
 
@@ -188 +188 @@
         self.assertEqual(cset.date, datetime(2004, 6, 20, 16, 3, 17))
 
-    DELETED_TEST = """\
+    DELETED_TEST = u"""\
 cvs rlog: Logging docutils
 
@@ -228 +228 @@
         self.assertEqual(entry.action_kind, entry.DELETED)
 
-    COLLAPSE_TEST = """\
+    COLLAPSE_TEST = u"""\
 cvs rlog: Logging PyObjC/Doc
 
@@ -312 +312 @@
         self.assertEqual(cset.date, datetime(1996, 10, 18, 13, 48, 45))
 
-    BRANCHES_TEST = """\
+    BRANCHES_TEST = u"""\
 cvs rlog: Logging Archetypes/tests
 
@@ -350 +350 @@
         self.assertEqual(cset.log,"Fixed deepcopy problem in validations")
 
-    REPOSPATH_TEST = """\
+    REPOSPATH_TEST = u"""\
 cvs rlog: Logging Zope/spurious/dummy/dir
 cvs rlog: Logging Zope/lib/python/DateTime
@@ -384 +384 @@
         self.assertEqual(entry.name, 'lib/python/DateTime/DateTime.py')
 
-    LONGLOG_TEST = """\
+    LONGLOG_TEST = u"""\
 cvs rlog: Logging ATContentTypes
 
@@ -680 +680 @@
         self.assertEqual(entry.action_kind, entry.UPDATED)
 
-    SILLY_TEST = """\
+    SILLY_TEST = u"""\
 RCS file: /cvsroot/docutils/docutils/THANKS.txt,v
 head: 1.2
@@ -692 +692 @@
                           changesets_from_cvslog, log, 'docutils')
 
-    CREATED_IN_BRANCH_TEST = """\
+    CREATED_IN_BRANCH_TEST = u"""\
 cvs rlog: Logging dsssl-utils/bigdiesel/src
 
@@ -723 +723 @@
         self.assertEqual(len(csets), 1)
 
-    DESCRIPTION_TEST = """\
+    DESCRIPTION_TEST = u"""\
 cvs rlog: Logging Zope
 
@@ -756 +756 @@
         csets = changesets_from_cvslog(log, 'zope')
 
-    ADD_DEL_ADD_AGAIN_TEST = """\
+    ADD_DEL_ADD_AGAIN_TEST = u"""\
 cvs rlog: Logging test
 
@@ -820 +820 @@
         self.assertEqual(entry.action_kind, entry.ADDED)
 
-    MULTI_MODULE_TEST = """\
+    MULTI_MODULE_TEST = u"""\
 cvs rlog: Logging apache-1.3/src/test/vhtest/logs
 
@@ -867 +867 @@
         csets = changesets_from_cvslog(log, 'apache-1.3')
 
-    ENTRY_NAMES_TEST = """
+    ENTRY_NAMES_TEST = u"""
 cvs rlog: Logging Products/PluggableAuthService
 
@@ -894 +894 @@
         entry = cset.entries[0]
         self.assertEqual(entry.name, 'COPYRIGHT.txt')
+
+    ENCODING_TEST = u"""
+cvs rlog: Logging pxlib/src
+
+RCS file: /cvsroot/pxlib/pxlib/src/px_head.h,v
+head: 1.8
+branch:
+locks: strict
+access list:
+keyword substitution: kv
+total revisions: 9;     selected revisions: 2
+description:
+----------------------------
+revision 1.8
+date: 2005/08/17 16:07:40;  author: steinm;  state: Exp;  lines: +1 -0
+- added prototype for px_delete_data_from_block()
+----------------------------
+revision 1.7
+date: 2005/08/17 05:16:24;  author: steinm;  state: Exp;  lines: +1 -1
+­ new prototype for px_add_data_to_block()
+=============================================================================
+"""
+    def testUnicode(self):
+        """Verify cvs parser returns unicode strings"""
+
+        log = StringIO(self.ENCODING_TEST)
+        csets = changesets_from_cvslog(log, 'pxlib')
+
+        self.assertEqual(len(csets), 2)
+
+        log = csets[0].log
+        self.assertEqual(type(log), type(u'€'))
+        self.assertEqual(len(log), 42)
+        self.assertRaises(UnicodeEncodeError, log.encode, 'ascii')
+        self.assertEqual(len(log.encode('ascii', 'ignore')), 41)

vcpx/tests/tailor.py

@@ -101 +101 @@
 repository = :pserver:anonymous@cvs.sf.net:/cvsroot/pxlib
 module = pxlib
+encoding = iso-8859-1
 
 [cvs2hg]