eric: comparison eric6/ThirdParty/Pygments/pygments/cmdline.py

-:bf5f777260a6
+:21b0534faebc
 pygments.cmdline
 ~~~~~~~~~~~~~~~~
 Command line interface.
-:copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+:copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
 :license: BSD, see LICENSE for details.
 """
-from __future__ import print_function
 import os
 import sys
 import getopt
 from textwrap import dedent
 from pygments import __version__, highlight
 from pygments.util import ClassNotFound, OptionError, docstring_headline, \
-guess_decode, guess_decode_from_terminal, terminal_encoding
+guess_decode, guess_decode_from_terminal, terminal_encoding, \
+UnclosingTextIOWrapper
 from pygments.lexers import get_all_lexers, get_lexer_by_name, guess_lexer, \
 load_lexer_from_file, get_lexer_for_filename, find_lexer_class_for_filename
 from pygments.lexers.special import TextLexer
 from pygments.formatters.latex import LatexEmbeddedLexer, LatexFormatter
 from pygments.formatters import get_all_formatters, get_formatter_by_name, \
 if opts.pop('-h', None) is not None:
 print(usage)
 return 0
 if opts.pop('-V', None) is not None:
-print('Pygments version %s, (c) 2006-2017 by Georg Brandl.' % __version__)
+print('Pygments version %s, (c) 2006-2019 by Georg Brandl.' % __version__)
 return 0
 # handle ``pygmentize -L``
 L_opt = opts.pop('-L', None)
 if L_opt is not None:
 lexername = opts.pop('-l', None)
 if lexername:
 # custom lexer, located relative to user's cwd
 if allow_custom_lexer_formatter and '.py' in lexername:
 try:
+filename = None
+name = None
 if ':' in lexername:
 filename, name = lexername.rsplit(':', 1)
+if '.py' in name:
+# This can happen on Windows: If the lexername is
+# C:\lexer.py -- return to normal load path in that case
+name = None
+if filename and name:
 lexer = load_lexer_from_file(filename, name,
 **parsed_opts)
 else:
 lexer = load_lexer_from_file(lexername, **parsed_opts)
 except ClassNotFound as err:
 return 1
 elif '-s' not in opts:  # treat stdin as full file (-s support is later)
 # read code from terminal, always in binary mode since we want to
 # decode ourselves and be tolerant with it
-if sys.version_info > (3,):
+code = sys.stdin.buffer.read()  # use .buffer to get a binary stream
-# Python 3: we have to use .buffer to get a binary stream
-code = sys.stdin.buffer.read()
-else:
-code = sys.stdin.read()
 if not inencoding:
 code, inencoding = guess_decode_from_terminal(code, sys.stdin)
 # else the lexer will do the decoding
 if not lexer:
 try:
 fmter = opts.pop('-f', None)
 if fmter:
 # custom formatter, located relative to user's cwd
 if allow_custom_lexer_formatter and '.py' in fmter:
 try:
+filename = None
+name = None
 if ':' in fmter:
-file, fmtername = fmter.rsplit(':', 1)
+# Same logic as above for custom lexer
-fmter = load_formatter_from_file(file, fmtername,
+filename, name = fmter.rsplit(':', 1)
-**parsed_opts)
+if '.py' in name:
+name = None
+if filename and name:
+fmter = load_formatter_from_file(filename, name,
+**parsed_opts)
 else:
 fmter = load_formatter_from_file(fmter, **parsed_opts)
 except ClassNotFound as err:
 print('Error:', err, file=sys.stderr)
 return 1
 if not fmter:
 if '256' in os.environ.get('TERM', ''):
 fmter = Terminal256Formatter(**parsed_opts)
 else:
 fmter = TerminalFormatter(**parsed_opts)
-if sys.version_info > (3,):
+outfile = sys.stdout.buffer
-# Python 3: we have to use .buffer to get a binary stream
-outfile = sys.stdout.buffer
-else:
-outfile = sys.stdout
 # determine output encoding if not explicitly selected
 if not outencoding:
 if outfn:
 # output file? use lexer encoding for now (can still be None)
 # provide coloring under Windows, if possible
 if not outfn and sys.platform in ('win32', 'cygwin') and \
 fmter.name in ('Terminal', 'Terminal256'):  # pragma: no cover
 # unfortunately colorama doesn't support binary streams on Py3
-if sys.version_info > (3,):
+outfile = UnclosingTextIOWrapper(outfile, encoding=fmter.encoding)
-from pygments.util import UnclosingTextIOWrapper
+fmter.encoding = None
-outfile = UnclosingTextIOWrapper(outfile, encoding=fmter.encoding)
-fmter.encoding = None
 try:
 import colorama.initialise
 except ImportError:
 pass
 else:
 return 0
 else:
 # line by line processing of stdin (eg: for 'tail -f')...
 try:
 while 1:
-if sys.version_info > (3,):
+line = sys.stdin.buffer.readline()
-# Python 3: we have to use .buffer to get a binary stream
-line = sys.stdin.buffer.readline()
-else:
-line = sys.stdin.readline()
 if not line:
 break
 if not inencoding:
 line = guess_decode_from_terminal(line, sys.stdin)[0]
 highlight(line, lexer, fmter, outfile)
 print('*' * 65, file=sys.stderr)
 print('An unhandled exception occurred while highlighting.',
 file=sys.stderr)
 print('Please report the whole traceback to the issue tracker at',
 file=sys.stderr)
-print('<https://bitbucket.org/birkenfeld/pygments-main/issues>.',
+print('<https://github.com/pygments/pygments/issues>.',
 file=sys.stderr)
 print('*' * 65, file=sys.stderr)
 print(file=sys.stderr)
 raise
 import traceback

Mercurial Repositories > eric / file comparison

comparison: eric6/ThirdParty/Pygments/pygments/cmdline.py

eric6/ThirdParty/Pygments/pygments/cmdline.py