List for cgit developers and users
 help / color / mirror / Atom feed
* [PATCH 1/1] filters: port syntax-highlighting.py to python 3.x
@ 2015-10-12 16:23 list
  2015-10-12 16:36 ` Jason
  0 siblings, 1 reply; 2+ messages in thread
From: list @ 2015-10-12 16:23 UTC (permalink / raw)


From: Christian Hesse <mail at eworm.de>

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 filters/syntax-highlighting.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/filters/syntax-highlighting.py b/filters/syntax-highlighting.py
index bcf32c8..a7ebf18 100755
--- a/filters/syntax-highlighting.py
+++ b/filters/syntax-highlighting.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # This script uses Pygments and Python2. You must have both installed
 # for this to work.
@@ -29,25 +29,24 @@ from pygments.lexers import guess_lexer_for_filename
 from pygments.formatters import HtmlFormatter
 
 
-# read stdin and decode to utf-8. ignore any unkown signs.
-data = sys.stdin.read().decode(encoding='utf-8', errors='ignore')
+data = sys.stdin.read()
 filename = sys.argv[1]
-formatter = HtmlFormatter(encoding='utf-8', style='pastie')
+formatter = HtmlFormatter(style='pastie')
 
 try:
-	lexer = guess_lexer_for_filename(filename, data, encoding='utf-8')
+	lexer = guess_lexer_for_filename(filename, data)
 except ClassNotFound:
 	# check if there is any shebang
 	if data[0:2] == '#!':
-		lexer = guess_lexer(data, encoding='utf-8')
+		lexer = guess_lexer(data)
 	else:
-		lexer = TextLexer(encoding='utf-8')
+		lexer = TextLexer()
 except TypeError:
-	lexer = TextLexer(encoding='utf-8')
+	lexer = TextLexer()
 
 # highlight! :-)
 # printout pygments' css definitions as well
 sys.stdout.write('<style>')
 sys.stdout.write(formatter.get_style_defs('.highlight'))
 sys.stdout.write('</style>')
-highlight(data, lexer, formatter, outfile=sys.stdout)
+sys.stdout.write(highlight(data, lexer, formatter, outfile=None))
-- 
2.6.1



^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH 1/1] filters: port syntax-highlighting.py to python 3.x
  2015-10-12 16:23 [PATCH 1/1] filters: port syntax-highlighting.py to python 3.x list
@ 2015-10-12 16:36 ` Jason
  0 siblings, 0 replies; 2+ messages in thread
From: Jason @ 2015-10-12 16:36 UTC (permalink / raw)


Thanks, applied.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-10-12 16:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-12 16:23 [PATCH 1/1] filters: port syntax-highlighting.py to python 3.x list
2015-10-12 16:36 ` Jason

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).