Hello community, here is the log from the commit of package viewvc for openSUSE:13.1 checked in at 2013-09-25 17:23:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/viewvc (Old) and /work/SRC/openSUSE:13.1/.viewvc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "viewvc" Changes: -------- --- /work/SRC/openSUSE:13.1/viewvc/viewvc.changes 2013-09-23 11:14:20.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.viewvc.new/viewvc.changes 2013-09-25 17:23:48.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 16 09:50:44 UTC 2013 - [email protected] + +- update to 1.1.21: + * restore compatibility with Python 2.6.x + +------------------------------------------------------------------- Old: ---- viewvc-1.1.20.tar.gz New: ---- viewvc-1.1.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ viewvc.spec ++++++ --- /var/tmp/diff_new_pack.cLjkYg/_old 2013-09-25 17:23:49.000000000 +0200 +++ /var/tmp/diff_new_pack.cLjkYg/_new 2013-09-25 17:23:49.000000000 +0200 @@ -19,7 +19,7 @@ Name: viewvc BuildRequires: apache2-devel BuildRequires: python-devel -Version: 1.1.20 +Version: 1.1.21 Release: 0 # %define apxs /usr/sbin/apxs2 ++++++ viewvc-1.1.20.tar.gz -> viewvc-1.1.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/viewvc-1.1.20/CHANGES new/viewvc-1.1.21/CHANGES --- old/viewvc-1.1.20/CHANGES 2013-04-24 15:26:07.000000000 +0200 +++ new/viewvc-1.1.21/CHANGES 2013-09-13 15:39:39.000000000 +0200 @@ -1,3 +1,7 @@ +Version 1.1.21 (released 13-Sep-2013) + + * fix markup/annotate exception with Python < 2.7 (issue #527) + Version 1.1.20 (released 24-Apr-2013) * fix tab-to-space handling regression in markup view diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/viewvc-1.1.20/lib/viewvc.py new/viewvc-1.1.21/lib/viewvc.py --- old/viewvc-1.1.20/lib/viewvc.py 2013-04-24 15:27:13.000000000 +0200 +++ new/viewvc-1.1.21/lib/viewvc.py 2013-09-13 15:40:52.000000000 +0200 @@ -14,7 +14,7 @@ # # ----------------------------------------------------------------------- -__version__ = '1.1.20' +__version__ = '1.1.21' # this comes from our library; measure the startup time import debug @@ -1288,10 +1288,7 @@ the number of visible characters in the result string, and a boolean flag indicating whether or not S was truncated. """ - out = '' - out_len = 0 - tokens = self.tokenize_text(s) - return tokens.get_result() + return self.tokenize_text(s).get_result(maxlen) def tokenize_text(self, s): """Return a ViewVCHtmlFormatterTokens object containing the tokens @@ -1687,9 +1684,11 @@ if not encoding or encoding == 'utf-8': return text - return unicode(text, encoding, - errors='replace').encode('utf-8', - errors='replace') + try: + return unicode(text, encoding, 'replace').encode('utf-8', 'replace') + except: + pass + return text def markup_stream(request, cfg, blame_data, file_lines, filename, mime_type, encoding, colorize): -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
