[Python-modules-commits] r15856 - in packages/pygments/trunk/debian (2 files)

[piotr at users.alioth.debian.org]

    Date: Wednesday, February 23, 2011 @ 20:33:29
  Author: piotr
Revision: 15856

make_utf8_default patch: do not change the encoding guessing part in
pygments/lexer.py 

Modified:
  packages/pygments/trunk/debian/changelog
  packages/pygments/trunk/debian/patches/make_utf8_default.patch

Modified: packages/pygments/trunk/debian/changelog
===================================================================
--- packages/pygments/trunk/debian/changelog	2011-02-23 19:56:01 UTC (rev 15855)
+++ packages/pygments/trunk/debian/changelog	2011-02-23 20:33:29 UTC (rev 15856)
@@ -1,3 +1,10 @@
+pygments (1.4+dfsg-2) UNRELEASED; urgency=low
+
+  * make_utf8_default patch: do not change the encoding guessing part in
+    pygments/lexer.py 
+
+ -- Piotr Ożarowski <piotr at debian.org>  Wed, 23 Feb 2011 21:30:53 +0100
+
 pygments (1.4+dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/pygments/trunk/debian/patches/make_utf8_default.patch
===================================================================
--- packages/pygments/trunk/debian/patches/make_utf8_default.patch	2011-02-23 19:56:01 UTC (rev 15855)
+++ packages/pygments/trunk/debian/patches/make_utf8_default.patch	2011-02-23 20:33:29 UTC (rev 15856)
@@ -67,15 +67,6 @@
          # self.encoding = options.get('inencoding', None) or self.encoding
          self.filters = []
          for filter_ in get_list_opt(options, 'filters', ()):
-@@ -134,7 +134,7 @@ class Lexer(object):
-                     if text.startswith(u'\ufeff'):
-                         text = text[len(u'\ufeff'):]
-                 except UnicodeDecodeError:
--                    text = text.decode('latin1')
-+                    text = text.decode('utf-8')
-             elif self.encoding == 'chardet':
-                 try:
-                     import chardet
 Index: Pygments-1.4/pygments/lexers/__init__.py
 ===================================================================
 --- Pygments-1.4.orig/pygments/lexers/__init__.py