diff options
311 files changed, 26 insertions, 339 deletions
diff --git a/doc/conf.py b/doc/conf.py index f4d74846..36760656 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Pygments documentation build configuration file # diff --git a/external/markdown-processor.py b/external/markdown-processor.py index 8d1afbbb..eaf913e9 100644 --- a/external/markdown-processor.py +++ b/external/markdown-processor.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ The Pygments Markdown Preprocessor ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/external/moin-parser.py b/external/moin-parser.py index b8d62f40..9fcba80b 100644 --- a/external/moin-parser.py +++ b/external/moin-parser.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ The Pygments MoinMoin Parser ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/external/rst-directive.py b/external/rst-directive.py index 90462561..a82ecfaf 100644 --- a/external/rst-directive.py +++ b/external/rst-directive.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ The Pygments reStructuredText directive ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/__init__.py b/pygments/__init__.py index 86523355..0fbeaf11 100644 --- a/pygments/__init__.py +++ b/pygments/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments ~~~~~~~~ diff --git a/pygments/__main__.py b/pygments/__main__.py index 3368bdf3..c6e2517d 100644 --- a/pygments/__main__.py +++ b/pygments/__main__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.__main__ ~~~~~~~~~~~~~~~~~ diff --git a/pygments/cmdline.py b/pygments/cmdline.py index cbd9d552..1a3aa5cb 100644 --- a/pygments/cmdline.py +++ b/pygments/cmdline.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.cmdline ~~~~~~~~~~~~~~~~ diff --git a/pygments/console.py b/pygments/console.py index 6e1d13e7..8dd08abe 100644 --- a/pygments/console.py +++ b/pygments/console.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.console ~~~~~~~~~~~~~~~~ diff --git a/pygments/filter.py b/pygments/filter.py index 36dbc7c8..85b48298 100644 --- a/pygments/filter.py +++ b/pygments/filter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.filter ~~~~~~~~~~~~~~~ diff --git a/pygments/filters/__init__.py b/pygments/filters/__init__.py index c1d0c888..930ff64e 100644 --- a/pygments/filters/__init__.py +++ b/pygments/filters/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.filters ~~~~~~~~~~~~~~~~ diff --git a/pygments/formatter.py b/pygments/formatter.py index 8af5805e..c3fe68d3 100644 --- a/pygments/formatter.py +++ b/pygments/formatter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatter ~~~~~~~~~~~~~~~~~~ diff --git a/pygments/formatters/__init__.py b/pygments/formatters/__init__.py index e5e69303..66c9e9d4 100644 --- a/pygments/formatters/__init__.py +++ b/pygments/formatters/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters ~~~~~~~~~~~~~~~~~~~ @@ -107,7 +106,7 @@ def load_formatter_from_file(filename, formattername="CustomFormatter", formatter_class = custom_namespace[formattername] # And finally instantiate it with the options return formatter_class(**options) - except IOError as err: + except OSError as err: raise ClassNotFound('cannot read %s: %s' % (filename, err)) except ClassNotFound: raise diff --git a/pygments/formatters/_mapping.py b/pygments/formatters/_mapping.py index 69657f9e..2592ef82 100755 --- a/pygments/formatters/_mapping.py +++ b/pygments/formatters/_mapping.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters._mapping ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/formatters/bbcode.py b/pygments/formatters/bbcode.py index 99913583..586a8925 100644 --- a/pygments/formatters/bbcode.py +++ b/pygments/formatters/bbcode.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters.bbcode ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/formatters/html.py b/pygments/formatters/html.py index 08aaa85f..7e903145 100644 --- a/pygments/formatters/html.py +++ b/pygments/formatters/html.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters.html ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -628,7 +627,7 @@ class HtmlFormatter(Formatter): with open(cssfilename, "w") as cf: cf.write(CSSFILE_TEMPLATE % {'styledefs': self.get_style_defs('body')}) - except IOError as err: + except OSError as err: err.strerror = 'Error writing CSS file: ' + err.strerror raise diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py index 55687505..78176e14 100644 --- a/pygments/formatters/img.py +++ b/pygments/formatters/img.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters.img ~~~~~~~~~~~~~~~~~~~~~~~ @@ -156,7 +155,7 @@ class FontManager: valname = '%s%s%s' % (basename, style and ' '+style, suffix) val, _ = _winreg.QueryValueEx(key, valname) return val - except EnvironmentError: + except OSError: continue else: if fail: @@ -190,7 +189,7 @@ class FontManager: lookuperror = err finally: _winreg.CloseKey(key) - except EnvironmentError: + except OSError: pass else: # If we get here, we checked all registry keys and had no luck diff --git a/pygments/formatters/irc.py b/pygments/formatters/irc.py index e4e59f2a..ab76fb83 100644 --- a/pygments/formatters/irc.py +++ b/pygments/formatters/irc.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters.irc ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/formatters/latex.py b/pygments/formatters/latex.py index 6ebe935f..bd7ef9fa 100644 --- a/pygments/formatters/latex.py +++ b/pygments/formatters/latex.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters.latex ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/formatters/other.py b/pygments/formatters/other.py index d7c6803c..16c2fceb 100644 --- a/pygments/formatters/other.py +++ b/pygments/formatters/other.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters.other ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/formatters/rtf.py b/pygments/formatters/rtf.py index 890de2a2..ba071c78 100644 --- a/pygments/formatters/rtf.py +++ b/pygments/formatters/rtf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters.rtf ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/formatters/svg.py b/pygments/formatters/svg.py index 1ec703ee..6950cd96 100644 --- a/pygments/formatters/svg.py +++ b/pygments/formatters/svg.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters.svg ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/formatters/terminal.py b/pygments/formatters/terminal.py index 0499b6fa..cd4e2ce3 100644 --- a/pygments/formatters/terminal.py +++ b/pygments/formatters/terminal.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters.terminal ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/formatters/terminal256.py b/pygments/formatters/terminal256.py index c0c46476..0c318c5c 100644 --- a/pygments/formatters/terminal256.py +++ b/pygments/formatters/terminal256.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.formatters.terminal256 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexer.py b/pygments/lexer.py index 671c117b..cf9ebdf4 100644 --- a/pygments/lexer.py +++ b/pygments/lexer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexer ~~~~~~~~~~~~~~ diff --git a/pygments/lexers/__init__.py b/pygments/lexers/__init__.py index 5a3f5bbd..9b89b6da 100644 --- a/pygments/lexers/__init__.py +++ b/pygments/lexers/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers ~~~~~~~~~~~~~~~ @@ -146,7 +145,7 @@ def load_lexer_from_file(filename, lexername="CustomLexer", **options): lexer_class = custom_namespace[lexername] # And finally instantiate it with the options return lexer_class(**options) - except IOError as err: + except OSError as err: raise ClassNotFound('cannot read %s: %s' % (filename, err)) except ClassNotFound: raise diff --git a/pygments/lexers/_asy_builtins.py b/pygments/lexers/_asy_builtins.py index 884463af..74e057ef 100644 --- a/pygments/lexers/_asy_builtins.py +++ b/pygments/lexers/_asy_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._asy_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_cl_builtins.py b/pygments/lexers/_cl_builtins.py index ef4612ee..08d70e15 100644 --- a/pygments/lexers/_cl_builtins.py +++ b/pygments/lexers/_cl_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._cl_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_cocoa_builtins.py b/pygments/lexers/_cocoa_builtins.py index a5422775..1d714e04 100644 --- a/pygments/lexers/_cocoa_builtins.py +++ b/pygments/lexers/_cocoa_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._cocoa_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_csound_builtins.py b/pygments/lexers/_csound_builtins.py index 461a35f2..89fcb66b 100644 --- a/pygments/lexers/_csound_builtins.py +++ b/pygments/lexers/_csound_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._csound_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_lasso_builtins.py b/pygments/lexers/_lasso_builtins.py index 2d37252d..8fd0ff1b 100644 --- a/pygments/lexers/_lasso_builtins.py +++ b/pygments/lexers/_lasso_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._lasso_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_lua_builtins.py b/pygments/lexers/_lua_builtins.py index a9f4c5cf..f6a9b796 100644 --- a/pygments/lexers/_lua_builtins.py +++ b/pygments/lexers/_lua_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._lua_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py index 8360ec4e..ef3f63bb 100644 --- a/pygments/lexers/_mapping.py +++ b/pygments/lexers/_mapping.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._mapping ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_mql_builtins.py b/pygments/lexers/_mql_builtins.py index 997cdc28..5cc50a94 100644 --- a/pygments/lexers/_mql_builtins.py +++ b/pygments/lexers/_mql_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._mql_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_mysql_builtins.py b/pygments/lexers/_mysql_builtins.py index 121054c3..b6f2e2aa 100644 --- a/pygments/lexers/_mysql_builtins.py +++ b/pygments/lexers/_mysql_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._mysql_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_openedge_builtins.py b/pygments/lexers/_openedge_builtins.py index 65a73ada..bced5081 100644 --- a/pygments/lexers/_openedge_builtins.py +++ b/pygments/lexers/_openedge_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._openedge_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_php_builtins.py b/pygments/lexers/_php_builtins.py index 783ba4ad..168cb446 100644 --- a/pygments/lexers/_php_builtins.py +++ b/pygments/lexers/_php_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._php_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_postgres_builtins.py b/pygments/lexers/_postgres_builtins.py index f5e8f349..93bc4205 100644 --- a/pygments/lexers/_postgres_builtins.py +++ b/pygments/lexers/_postgres_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._postgres_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_scilab_builtins.py b/pygments/lexers/_scilab_builtins.py index 1393412b..e2cfcb96 100644 --- a/pygments/lexers/_scilab_builtins.py +++ b/pygments/lexers/_scilab_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._scilab_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_sourcemod_builtins.py b/pygments/lexers/_sourcemod_builtins.py index 27b11c3d..2977a2c0 100644 --- a/pygments/lexers/_sourcemod_builtins.py +++ b/pygments/lexers/_sourcemod_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._sourcemod_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_stan_builtins.py b/pygments/lexers/_stan_builtins.py index c6955394..f1516705 100644 --- a/pygments/lexers/_stan_builtins.py +++ b/pygments/lexers/_stan_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._stan_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_stata_builtins.py b/pygments/lexers/_stata_builtins.py index 2e430906..b2cc9880 100644 --- a/pygments/lexers/_stata_builtins.py +++ b/pygments/lexers/_stata_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._stata_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_tsql_builtins.py b/pygments/lexers/_tsql_builtins.py index ebf1edc1..e72e5a5a 100644 --- a/pygments/lexers/_tsql_builtins.py +++ b/pygments/lexers/_tsql_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._tsql_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_usd_builtins.py b/pygments/lexers/_usd_builtins.py index 64e4884c..28efd271 100644 --- a/pygments/lexers/_usd_builtins.py +++ b/pygments/lexers/_usd_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._usd_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_vbscript_builtins.py b/pygments/lexers/_vbscript_builtins.py index 0c19d720..7256a06f 100644 --- a/pygments/lexers/_vbscript_builtins.py +++ b/pygments/lexers/_vbscript_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._vbscript_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/_vim_builtins.py b/pygments/lexers/_vim_builtins.py index 55941ed6..96905113 100644 --- a/pygments/lexers/_vim_builtins.py +++ b/pygments/lexers/_vim_builtins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers._vim_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/actionscript.py b/pygments/lexers/actionscript.py index ef7c585b..3d6df13e 100644 --- a/pygments/lexers/actionscript.py +++ b/pygments/lexers/actionscript.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.actionscript ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/agile.py b/pygments/lexers/agile.py index bd71ecd4..e309624f 100644 --- a/pygments/lexers/agile.py +++ b/pygments/lexers/agile.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.agile ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/algebra.py b/pygments/lexers/algebra.py index 9fb22875..1dab98aa 100644 --- a/pygments/lexers/algebra.py +++ b/pygments/lexers/algebra.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.algebra ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/ambient.py b/pygments/lexers/ambient.py index 24e934d1..d27d126f 100644 --- a/pygments/lexers/ambient.py +++ b/pygments/lexers/ambient.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.ambient ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/ampl.py b/pygments/lexers/ampl.py index 6b566731..a1e2b260 100644 --- a/pygments/lexers/ampl.py +++ b/pygments/lexers/ampl.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.ampl ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/apl.py b/pygments/lexers/apl.py index 724f05b6..b6811164 100644 --- a/pygments/lexers/apl.py +++ b/pygments/lexers/apl.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.apl ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/archetype.py b/pygments/lexers/archetype.py index 26f5ea8c..f08f61e6 100644 --- a/pygments/lexers/archetype.py +++ b/pygments/lexers/archetype.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.archetype ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/arrow.py b/pygments/lexers/arrow.py index 65b684f1..064b1ab9 100644 --- a/pygments/lexers/arrow.py +++ b/pygments/lexers/arrow.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.arrow ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py index 94a792c5..d7e3e4ba 100644 --- a/pygments/lexers/asm.py +++ b/pygments/lexers/asm.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.asm ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/automation.py b/pygments/lexers/automation.py index 208fb962..41c63b53 100644 --- a/pygments/lexers/automation.py +++ b/pygments/lexers/automation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.automation ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/bare.py b/pygments/lexers/bare.py index 73437dde..5fc3cd85 100644 --- a/pygments/lexers/bare.py +++ b/pygments/lexers/bare.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.bare ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/basic.py b/pygments/lexers/basic.py index cb2d278d..1931d045 100644 --- a/pygments/lexers/basic.py +++ b/pygments/lexers/basic.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.basic ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/bibtex.py b/pygments/lexers/bibtex.py index 88302728..56b5218d 100644 --- a/pygments/lexers/bibtex.py +++ b/pygments/lexers/bibtex.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.bibtex ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/boa.py b/pygments/lexers/boa.py index e57b1230..53ce0291 100644 --- a/pygments/lexers/boa.py +++ b/pygments/lexers/boa.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.boa ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/business.py b/pygments/lexers/business.py index 76b8680c..69c3959f 100644 --- a/pygments/lexers/business.py +++ b/pygments/lexers/business.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.business ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/c_cpp.py b/pygments/lexers/c_cpp.py index 9d4edc68..f5e15543 100644 --- a/pygments/lexers/c_cpp.py +++ b/pygments/lexers/c_cpp.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.c_cpp ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/c_like.py b/pygments/lexers/c_like.py index cd771e88..41af0359 100644 --- a/pygments/lexers/c_like.py +++ b/pygments/lexers/c_like.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.c_like ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/capnproto.py b/pygments/lexers/capnproto.py index 2b35c6f0..7819af4c 100644 --- a/pygments/lexers/capnproto.py +++ b/pygments/lexers/capnproto.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.capnproto ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/chapel.py b/pygments/lexers/chapel.py index 06e3245d..a3f8ff7e 100644 --- a/pygments/lexers/chapel.py +++ b/pygments/lexers/chapel.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.chapel ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/clean.py b/pygments/lexers/clean.py index 96b32aea..bf1d4099 100644 --- a/pygments/lexers/clean.py +++ b/pygments/lexers/clean.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.clean ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py index b8590a96..13aa39ce 100644 --- a/pygments/lexers/compiled.py +++ b/pygments/lexers/compiled.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.compiled ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/configs.py b/pygments/lexers/configs.py index 8b67ebaf..16484287 100644 --- a/pygments/lexers/configs.py +++ b/pygments/lexers/configs.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.configs ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/console.py b/pygments/lexers/console.py index 22551d0c..9958f02a 100644 --- a/pygments/lexers/console.py +++ b/pygments/lexers/console.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.console ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/crystal.py b/pygments/lexers/crystal.py index 4151108d..60fc8d27 100644 --- a/pygments/lexers/crystal.py +++ b/pygments/lexers/crystal.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.crystal ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/csound.py b/pygments/lexers/csound.py index 0aafda7f..b969aa65 100644 --- a/pygments/lexers/csound.py +++ b/pygments/lexers/csound.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.csound ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/css.py b/pygments/lexers/css.py index 9bcea4e2..48641dc9 100644 --- a/pygments/lexers/css.py +++ b/pygments/lexers/css.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.css ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/d.py b/pygments/lexers/d.py index c2d29f27..b433b85d 100644 --- a/pygments/lexers/d.py +++ b/pygments/lexers/d.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.d ~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/dalvik.py b/pygments/lexers/dalvik.py index f67e1b0e..015c1461 100644 --- a/pygments/lexers/dalvik.py +++ b/pygments/lexers/dalvik.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.dalvik ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/data.py b/pygments/lexers/data.py index bc92582a..0fbae82e 100644 --- a/pygments/lexers/data.py +++ b/pygments/lexers/data.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.data ~~~~~~~~~~~~~~~~~~~~ @@ -691,7 +690,7 @@ class JsonLdLexer(JsonLexer): } def get_tokens_unprocessed(self, text): - for start, token, value in super(JsonLdLexer, self).get_tokens_unprocessed(text): + for start, token, value in super().get_tokens_unprocessed(text): if token is Name.Tag and value in self.json_ld_keywords: yield start, Name.Decorator, value else: diff --git a/pygments/lexers/devicetree.py b/pygments/lexers/devicetree.py index fdf6b0d7..9eca82a0 100644 --- a/pygments/lexers/devicetree.py +++ b/pygments/lexers/devicetree.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.devicetree ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/diff.py b/pygments/lexers/diff.py index 7df4a99e..97f3cccd 100644 --- a/pygments/lexers/diff.py +++ b/pygments/lexers/diff.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.diff ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/dotnet.py b/pygments/lexers/dotnet.py index dc4a2cf7..541e3eae 100644 --- a/pygments/lexers/dotnet.py +++ b/pygments/lexers/dotnet.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.dotnet ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/dsls.py b/pygments/lexers/dsls.py index 0049bb91..daa605f2 100644 --- a/pygments/lexers/dsls.py +++ b/pygments/lexers/dsls.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.dsls ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/dylan.py b/pygments/lexers/dylan.py index c743d7bb..0542095d 100644 --- a/pygments/lexers/dylan.py +++ b/pygments/lexers/dylan.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.dylan ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/ecl.py b/pygments/lexers/ecl.py index 2aba6350..6c9e5a3b 100644 --- a/pygments/lexers/ecl.py +++ b/pygments/lexers/ecl.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.ecl ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/eiffel.py b/pygments/lexers/eiffel.py index 075ad1a9..ca93754e 100644 --- a/pygments/lexers/eiffel.py +++ b/pygments/lexers/eiffel.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.eiffel ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/elm.py b/pygments/lexers/elm.py index 5fbb5eba..fa38131f 100644 --- a/pygments/lexers/elm.py +++ b/pygments/lexers/elm.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.elm ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/email.py b/pygments/lexers/email.py index 3b130ed6..0c3fe5fe 100644 --- a/pygments/lexers/email.py +++ b/pygments/lexers/email.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.email ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/erlang.py b/pygments/lexers/erlang.py index facca6cc..74b52c8a 100644 --- a/pygments/lexers/erlang.py +++ b/pygments/lexers/erlang.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.erlang ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/esoteric.py b/pygments/lexers/esoteric.py index 4b5894a5..416bab0f 100644 --- a/pygments/lexers/esoteric.py +++ b/pygments/lexers/esoteric.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.esoteric ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/ezhil.py b/pygments/lexers/ezhil.py index 6b314126..cc371a6e 100644 --- a/pygments/lexers/ezhil.py +++ b/pygments/lexers/ezhil.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.ezhil ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/factor.py b/pygments/lexers/factor.py index 9200547f..e24a5b81 100644 --- a/pygments/lexers/factor.py +++ b/pygments/lexers/factor.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.factor ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/fantom.py b/pygments/lexers/fantom.py index e0cbbac8..f4b95b47 100644 --- a/pygments/lexers/fantom.py +++ b/pygments/lexers/fantom.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.fantom ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/felix.py b/pygments/lexers/felix.py index 931e8de8..8d5a5d7a 100644 --- a/pygments/lexers/felix.py +++ b/pygments/lexers/felix.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.felix ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/floscript.py b/pygments/lexers/floscript.py index beb8d3c8..82ebc0c3 100644 --- a/pygments/lexers/floscript.py +++ b/pygments/lexers/floscript.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.floscript ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/forth.py b/pygments/lexers/forth.py index a803b143..90b5e1f8 100644 --- a/pygments/lexers/forth.py +++ b/pygments/lexers/forth.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.forth ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/fortran.py b/pygments/lexers/fortran.py index 86f8d120..5d020f84 100644 --- a/pygments/lexers/fortran.py +++ b/pygments/lexers/fortran.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.fortran ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/foxpro.py b/pygments/lexers/foxpro.py index a32be7a4..0b756d4d 100644 --- a/pygments/lexers/foxpro.py +++ b/pygments/lexers/foxpro.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.foxpro ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/freefem.py b/pygments/lexers/freefem.py index a8fc42cc..532f134f 100644 --- a/pygments/lexers/freefem.py +++ b/pygments/lexers/freefem.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.freefem ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/functional.py b/pygments/lexers/functional.py index bb73eb17..e33a72e2 100644 --- a/pygments/lexers/functional.py +++ b/pygments/lexers/functional.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.functional ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/gdscript.py b/pygments/lexers/gdscript.py index b235be9f..ee393702 100644 --- a/pygments/lexers/gdscript.py +++ b/pygments/lexers/gdscript.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.gdscript ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/go.py b/pygments/lexers/go.py index e462799e..b37a6e16 100644 --- a/pygments/lexers/go.py +++ b/pygments/lexers/go.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.go ~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/grammar_notation.py b/pygments/lexers/grammar_notation.py index b8576eb6..79c02e38 100644 --- a/pygments/lexers/grammar_notation.py +++ b/pygments/lexers/grammar_notation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.grammar_notation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/graph.py b/pygments/lexers/graph.py index ec565801..bd82f761 100644 --- a/pygments/lexers/graph.py +++ b/pygments/lexers/graph.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.graph ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/graphics.py b/pygments/lexers/graphics.py index f2d901ac..7e944bab 100644 --- a/pygments/lexers/graphics.py +++ b/pygments/lexers/graphics.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.graphics ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/haskell.py b/pygments/lexers/haskell.py index 52342024..bc4b2011 100644 --- a/pygments/lexers/haskell.py +++ b/pygments/lexers/haskell.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.haskell ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/haxe.py b/pygments/lexers/haxe.py index c08597c5..d970eacb 100644 --- a/pygments/lexers/haxe.py +++ b/pygments/lexers/haxe.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.haxe ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/hdl.py b/pygments/lexers/hdl.py index 45a86096..e2a8190c 100644 --- a/pygments/lexers/hdl.py +++ b/pygments/lexers/hdl.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.hdl ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/hexdump.py b/pygments/lexers/hexdump.py index d9fe7f83..a29359a6 100644 --- a/pygments/lexers/hexdump.py +++ b/pygments/lexers/hexdump.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.hexdump ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/html.py b/pygments/lexers/html.py index 2c2e4447..aab83025 100644 --- a/pygments/lexers/html.py +++ b/pygments/lexers/html.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.html ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/idl.py b/pygments/lexers/idl.py index b2dc90fb..22b8346a 100644 --- a/pygments/lexers/idl.py +++ b/pygments/lexers/idl.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.idl ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/igor.py b/pygments/lexers/igor.py index f8047863..e843d081 100644 --- a/pygments/lexers/igor.py +++ b/pygments/lexers/igor.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.igor ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/inferno.py b/pygments/lexers/inferno.py index 7fe7e0ef..befe42ab 100644 --- a/pygments/lexers/inferno.py +++ b/pygments/lexers/inferno.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.inferno ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/installers.py b/pygments/lexers/installers.py index 919279f6..a4bc0774 100644 --- a/pygments/lexers/installers.py +++ b/pygments/lexers/installers.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.installers ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/int_fiction.py b/pygments/lexers/int_fiction.py index 158bf3b9..c309d192 100644 --- a/pygments/lexers/int_fiction.py +++ b/pygments/lexers/int_fiction.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.int_fiction ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/iolang.py b/pygments/lexers/iolang.py index cf791cf6..c1fbe908 100644 --- a/pygments/lexers/iolang.py +++ b/pygments/lexers/iolang.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.iolang ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/j.py b/pygments/lexers/j.py index 1e32884c..53bbdfb3 100644 --- a/pygments/lexers/j.py +++ b/pygments/lexers/j.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.j ~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/javascript.py b/pygments/lexers/javascript.py index cac817d8..2f9b9b1c 100644 --- a/pygments/lexers/javascript.py +++ b/pygments/lexers/javascript.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.javascript ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/julia.py b/pygments/lexers/julia.py index 5e52f927..be8c1333 100644 --- a/pygments/lexers/julia.py +++ b/pygments/lexers/julia.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.julia ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py index 9a9397c2..557318c8 100644 --- a/pygments/lexers/jvm.py +++ b/pygments/lexers/jvm.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.jvm ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py index fa9f3bb7..531c66a0 100644 --- a/pygments/lexers/lisp.py +++ b/pygments/lexers/lisp.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.lisp ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/make.py b/pygments/lexers/make.py index b3c1b688..47041660 100644 --- a/pygments/lexers/make.py +++ b/pygments/lexers/make.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.make ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/markup.py b/pygments/lexers/markup.py index 88e09ec2..a2432cd9 100644 --- a/pygments/lexers/markup.py +++ b/pygments/lexers/markup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.markup ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/math.py b/pygments/lexers/math.py index c0426ee3..88f810e7 100644 --- a/pygments/lexers/math.py +++ b/pygments/lexers/math.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.math ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/matlab.py b/pygments/lexers/matlab.py index 57884862..0654cc0c 100644 --- a/pygments/lexers/matlab.py +++ b/pygments/lexers/matlab.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.matlab ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/mime.py b/pygments/lexers/mime.py index 2e21af79..6ad77605 100644 --- a/pygments/lexers/mime.py +++ b/pygments/lexers/mime.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.mime ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/ml.py b/pygments/lexers/ml.py index be7ea7f7..4709407d 100644 --- a/pygments/lexers/ml.py +++ b/pygments/lexers/ml.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.ml ~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/modeling.py b/pygments/lexers/modeling.py index 0e976e2f..b00a7f10 100644 --- a/pygments/lexers/modeling.py +++ b/pygments/lexers/modeling.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.modeling ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/modula2.py b/pygments/lexers/modula2.py index 142dedbf..cad2f4fd 100644 --- a/pygments/lexers/modula2.py +++ b/pygments/lexers/modula2.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.modula2 ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/monte.py b/pygments/lexers/monte.py index 8498179c..4cd83241 100644 --- a/pygments/lexers/monte.py +++ b/pygments/lexers/monte.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.monte ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/mosel.py b/pygments/lexers/mosel.py index 02bd6657..62cb3b4c 100644 --- a/pygments/lexers/mosel.py +++ b/pygments/lexers/mosel.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.mosel ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/ncl.py b/pygments/lexers/ncl.py index 1d9e1760..f9df40bd 100644 --- a/pygments/lexers/ncl.py +++ b/pygments/lexers/ncl.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.ncl ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/nimrod.py b/pygments/lexers/nimrod.py index 74051405..3cd3f624 100644 --- a/pygments/lexers/nimrod.py +++ b/pygments/lexers/nimrod.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.nimrod ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/nit.py b/pygments/lexers/nit.py index ddc1bfc4..7a15d78f 100644 --- a/pygments/lexers/nit.py +++ b/pygments/lexers/nit.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.nit ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/nix.py b/pygments/lexers/nix.py index 8c4c9187..bd7afe74 100644 --- a/pygments/lexers/nix.py +++ b/pygments/lexers/nix.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.nix ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/oberon.py b/pygments/lexers/oberon.py index 53db0797..7010e910 100644 --- a/pygments/lexers/oberon.py +++ b/pygments/lexers/oberon.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.oberon ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/objective.py b/pygments/lexers/objective.py index 38ac9bb0..22364471 100644 --- a/pygments/lexers/objective.py +++ b/pygments/lexers/objective.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.objective ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/ooc.py b/pygments/lexers/ooc.py index f4f3d62c..0c74cdec 100644 --- a/pygments/lexers/ooc.py +++ b/pygments/lexers/ooc.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.ooc ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py index 02768c5c..b0930088 100644 --- a/pygments/lexers/other.py +++ b/pygments/lexers/other.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.other ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/parasail.py b/pygments/lexers/parasail.py index 66868814..49d8d672 100644 --- a/pygments/lexers/parasail.py +++ b/pygments/lexers/parasail.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.parasail ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/parsers.py b/pygments/lexers/parsers.py index 8b6340d0..cbc10dba 100644 --- a/pygments/lexers/parsers.py +++ b/pygments/lexers/parsers.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.parsers ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/pascal.py b/pygments/lexers/pascal.py index 5ba400fd..0d1ac3fd 100644 --- a/pygments/lexers/pascal.py +++ b/pygments/lexers/pascal.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.pascal ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/pawn.py b/pygments/lexers/pawn.py index 12cd52c1..4fd37a1f 100644 --- a/pygments/lexers/pawn.py +++ b/pygments/lexers/pawn.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.pawn ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/perl.py b/pygments/lexers/perl.py index 3a3a60e4..bac325bb 100644 --- a/pygments/lexers/perl.py +++ b/pygments/lexers/perl.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.perl ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/php.py b/pygments/lexers/php.py index 417cb2ff..3ba299ac 100644 --- a/pygments/lexers/php.py +++ b/pygments/lexers/php.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.php ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/pointless.py b/pygments/lexers/pointless.py index 25ca2115..c3401073 100644 --- a/pygments/lexers/pointless.py +++ b/pygments/lexers/pointless.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.pointless ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/pony.py b/pygments/lexers/pony.py index 94bf6952..0cd5dbd3 100644 --- a/pygments/lexers/pony.py +++ b/pygments/lexers/pony.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.pony ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/praat.py b/pygments/lexers/praat.py index dcfce0d6..8fbae8c5 100644 --- a/pygments/lexers/praat.py +++ b/pygments/lexers/praat.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.praat ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/prolog.py b/pygments/lexers/prolog.py index 1d9ad4dc..cb4233d6 100644 --- a/pygments/lexers/prolog.py +++ b/pygments/lexers/prolog.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.prolog ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/promql.py b/pygments/lexers/promql.py index 7f31aead..e58182c8 100644 --- a/pygments/lexers/promql.py +++ b/pygments/lexers/promql.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.promql ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/python.py b/pygments/lexers/python.py index 8a9b7239..6164c260 100644 --- a/pygments/lexers/python.py +++ b/pygments/lexers/python.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.python ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/qvt.py b/pygments/lexers/qvt.py index c93fec96..72817f09 100644 --- a/pygments/lexers/qvt.py +++ b/pygments/lexers/qvt.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.qvt ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/r.py b/pygments/lexers/r.py index 1bde7fa4..643fb3a0 100644 --- a/pygments/lexers/r.py +++ b/pygments/lexers/r.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.r ~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/rdf.py b/pygments/lexers/rdf.py index 7f4208a9..bd7a4f69 100644 --- a/pygments/lexers/rdf.py +++ b/pygments/lexers/rdf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.rdf ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/rebol.py b/pygments/lexers/rebol.py index 79993ad3..57480a1c 100644 --- a/pygments/lexers/rebol.py +++ b/pygments/lexers/rebol.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.rebol ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/resource.py b/pygments/lexers/resource.py index 263b8f4b..2cbacbcc 100644 --- a/pygments/lexers/resource.py +++ b/pygments/lexers/resource.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.resource ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/ride.py b/pygments/lexers/ride.py index ff2d1c79..07cc1ef6 100644 --- a/pygments/lexers/ride.py +++ b/pygments/lexers/ride.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.ride ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/rnc.py b/pygments/lexers/rnc.py index 8d843616..ffb95f3f 100644 --- a/pygments/lexers/rnc.py +++ b/pygments/lexers/rnc.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.rnc ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/roboconf.py b/pygments/lexers/roboconf.py index 4a589cbf..43801138 100644 --- a/pygments/lexers/roboconf.py +++ b/pygments/lexers/roboconf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.roboconf ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/robotframework.py b/pygments/lexers/robotframework.py index a8839ad6..305cc26f 100644 --- a/pygments/lexers/robotframework.py +++ b/pygments/lexers/robotframework.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.robotframework ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/ruby.py b/pygments/lexers/ruby.py index 9a4fbfb8..d2244cf8 100644 --- a/pygments/lexers/ruby.py +++ b/pygments/lexers/ruby.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.ruby ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/rust.py b/pygments/lexers/rust.py index bab40370..3a162b00 100644 --- a/pygments/lexers/rust.py +++ b/pygments/lexers/rust.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.rust ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/sas.py b/pygments/lexers/sas.py index 30223463..7d7f9d36 100644 --- a/pygments/lexers/sas.py +++ b/pygments/lexers/sas.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.sas ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/scdoc.py b/pygments/lexers/scdoc.py index 492c8fce..48b0682a 100644 --- a/pygments/lexers/scdoc.py +++ b/pygments/lexers/scdoc.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.scdoc ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/scripting.py b/pygments/lexers/scripting.py index f8e9f209..7f92eb16 100644 --- a/pygments/lexers/scripting.py +++ b/pygments/lexers/scripting.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.scripting ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/sgf.py b/pygments/lexers/sgf.py index 02dab490..1098a927 100644 --- a/pygments/lexers/sgf.py +++ b/pygments/lexers/sgf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.sgf ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/shell.py b/pygments/lexers/shell.py index d918b70a..1f433b8f 100644 --- a/pygments/lexers/shell.py +++ b/pygments/lexers/shell.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.shell ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/sieve.py b/pygments/lexers/sieve.py index 6335b8ed..6fa33d31 100644 --- a/pygments/lexers/sieve.py +++ b/pygments/lexers/sieve.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.sieve ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/slash.py b/pygments/lexers/slash.py index 6a0ae0f1..df0e23de 100644 --- a/pygments/lexers/slash.py +++ b/pygments/lexers/slash.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.slash ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/smalltalk.py b/pygments/lexers/smalltalk.py index 8689af09..ebb3311d 100644 --- a/pygments/lexers/smalltalk.py +++ b/pygments/lexers/smalltalk.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.smalltalk ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/smv.py b/pygments/lexers/smv.py index 660e0a93..7db2070f 100644 --- a/pygments/lexers/smv.py +++ b/pygments/lexers/smv.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.smv ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/snobol.py b/pygments/lexers/snobol.py index bc2feb72..b5719c3a 100644 --- a/pygments/lexers/snobol.py +++ b/pygments/lexers/snobol.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.snobol ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/solidity.py b/pygments/lexers/solidity.py index cc450f28..0c42586f 100644 --- a/pygments/lexers/solidity.py +++ b/pygments/lexers/solidity.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.solidity ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/special.py b/pygments/lexers/special.py index 5e369d05..630eae9b 100644 --- a/pygments/lexers/special.py +++ b/pygments/lexers/special.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.special ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py index c8a2e440..0611ab7c 100644 --- a/pygments/lexers/sql.py +++ b/pygments/lexers/sql.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.sql ~~~~~~~~~~~~~~~~~~~ @@ -102,8 +101,7 @@ def language_callback(lexer, match): yield (match.start(3), String, match.group(3)) # 4 = string contents if lx: - for x in lx.get_tokens_unprocessed(match.group(4)): - yield x + yield from lx.get_tokens_unprocessed(match.group(4)) else: yield (match.start(4), String, match.group(4)) # 5 = $, 6 = delimiter, 7 = $ diff --git a/pygments/lexers/stata.py b/pygments/lexers/stata.py index c5011206..4ec6cf4f 100644 --- a/pygments/lexers/stata.py +++ b/pygments/lexers/stata.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.stata ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/supercollider.py b/pygments/lexers/supercollider.py index 1abd4ac8..5129e9b4 100644 --- a/pygments/lexers/supercollider.py +++ b/pygments/lexers/supercollider.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.supercollider ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/tcl.py b/pygments/lexers/tcl.py index 03c0d049..9fb50901 100644 --- a/pygments/lexers/tcl.py +++ b/pygments/lexers/tcl.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.tcl ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py index 5c3346b4..15ea0ec9 100644 --- a/pygments/lexers/templates.py +++ b/pygments/lexers/templates.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.templates ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/teraterm.py b/pygments/lexers/teraterm.py index 05ad900b..d09c66f6 100644 --- a/pygments/lexers/teraterm.py +++ b/pygments/lexers/teraterm.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.teraterm ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/testing.py b/pygments/lexers/testing.py index b8707d23..81c42971 100644 --- a/pygments/lexers/testing.py +++ b/pygments/lexers/testing.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.testing ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/text.py b/pygments/lexers/text.py index 19a8fe03..68e06594 100644 --- a/pygments/lexers/text.py +++ b/pygments/lexers/text.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.text ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/textedit.py b/pygments/lexers/textedit.py index df25d1cd..24fbe2e4 100644 --- a/pygments/lexers/textedit.py +++ b/pygments/lexers/textedit.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.textedit ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/textfmts.py b/pygments/lexers/textfmts.py index d82201a8..62d300a5 100644 --- a/pygments/lexers/textfmts.py +++ b/pygments/lexers/textfmts.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.textfmts ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/theorem.py b/pygments/lexers/theorem.py index 75661d47..eee11269 100644 --- a/pygments/lexers/theorem.py +++ b/pygments/lexers/theorem.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.theorem ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/tnt.py b/pygments/lexers/tnt.py index f11956a7..50fa3335 100644 --- a/pygments/lexers/tnt.py +++ b/pygments/lexers/tnt.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.tnt ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/trafficscript.py b/pygments/lexers/trafficscript.py index 6f518cbf..088258ae 100644 --- a/pygments/lexers/trafficscript.py +++ b/pygments/lexers/trafficscript.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.trafficscript ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/typoscript.py b/pygments/lexers/typoscript.py index 1689cd15..b2e4299b 100644 --- a/pygments/lexers/typoscript.py +++ b/pygments/lexers/typoscript.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.typoscript ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/unicon.py b/pygments/lexers/unicon.py index 13a80e81..4a76a0f8 100644 --- a/pygments/lexers/unicon.py +++ b/pygments/lexers/unicon.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.unicon ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/urbi.py b/pygments/lexers/urbi.py index 0640cc5c..d9c1c9f8 100644 --- a/pygments/lexers/urbi.py +++ b/pygments/lexers/urbi.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.urbi ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/usd.py b/pygments/lexers/usd.py index a5ec4701..2b4ace86 100644 --- a/pygments/lexers/usd.py +++ b/pygments/lexers/usd.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.usd ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/varnish.py b/pygments/lexers/varnish.py index 9d358bd7..618049be 100644 --- a/pygments/lexers/varnish.py +++ b/pygments/lexers/varnish.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.varnish ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/verification.py b/pygments/lexers/verification.py index 1aeb55f0..2d473ae8 100644 --- a/pygments/lexers/verification.py +++ b/pygments/lexers/verification.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.verification ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py index cb59e325..a1860488 100644 --- a/pygments/lexers/web.py +++ b/pygments/lexers/web.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.web ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/webidl.py b/pygments/lexers/webidl.py index d98b11a7..d805484c 100644 --- a/pygments/lexers/webidl.py +++ b/pygments/lexers/webidl.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.webidl ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/webmisc.py b/pygments/lexers/webmisc.py index abc9076c..b32005e4 100644 --- a/pygments/lexers/webmisc.py +++ b/pygments/lexers/webmisc.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.webmisc ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/whiley.py b/pygments/lexers/whiley.py index 4c7ddde0..82b100bc 100644 --- a/pygments/lexers/whiley.py +++ b/pygments/lexers/whiley.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.whiley ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/x10.py b/pygments/lexers/x10.py index 72254e33..5c01fe5e 100644 --- a/pygments/lexers/x10.py +++ b/pygments/lexers/x10.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.x10 ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/xorg.py b/pygments/lexers/xorg.py index 762a512b..490b7c1d 100644 --- a/pygments/lexers/xorg.py +++ b/pygments/lexers/xorg.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.xorg ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/yang.py b/pygments/lexers/yang.py index 8a825d48..4452df2d 100644 --- a/pygments/lexers/yang.py +++ b/pygments/lexers/yang.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.yang ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/lexers/zig.py b/pygments/lexers/zig.py index 4f443ac2..4a36832b 100644 --- a/pygments/lexers/zig.py +++ b/pygments/lexers/zig.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.lexers.zig ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/modeline.py b/pygments/modeline.py index c6670270..047d86d6 100644 --- a/pygments/modeline.py +++ b/pygments/modeline.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.modeline ~~~~~~~~~~~~~~~~~ diff --git a/pygments/plugin.py b/pygments/plugin.py index 213eec7c..b1085b7a 100644 --- a/pygments/plugin.py +++ b/pygments/plugin.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.plugin ~~~~~~~~~~~~~~~ @@ -44,7 +43,7 @@ FILTER_ENTRY_POINT = 'pygments.filters' def iter_entry_points(group_name): try: import pkg_resources - except (ImportError, IOError): + except (ImportError, OSError): return [] return pkg_resources.iter_entry_points(group_name) diff --git a/pygments/regexopt.py b/pygments/regexopt.py index 9fb70b13..bcbe829d 100644 --- a/pygments/regexopt.py +++ b/pygments/regexopt.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.regexopt ~~~~~~~~~~~~~~~~~ diff --git a/pygments/scanner.py b/pygments/scanner.py index b35727df..5f32a22c 100644 --- a/pygments/scanner.py +++ b/pygments/scanner.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.scanner ~~~~~~~~~~~~~~~~ diff --git a/pygments/sphinxext.py b/pygments/sphinxext.py index 3d9105fa..644eb8c3 100644 --- a/pygments/sphinxext.py +++ b/pygments/sphinxext.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.sphinxext ~~~~~~~~~~~~~~~~~~ diff --git a/pygments/style.py b/pygments/style.py index c9bd9725..989a61cd 100644 --- a/pygments/style.py +++ b/pygments/style.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.style ~~~~~~~~~~~~~~ diff --git a/pygments/styles/__init__.py b/pygments/styles/__init__.py index 4980cd80..8d1c717b 100644 --- a/pygments/styles/__init__.py +++ b/pygments/styles/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles ~~~~~~~~~~~~~~~ diff --git a/pygments/styles/abap.py b/pygments/styles/abap.py index 91497793..1e51e050 100644 --- a/pygments/styles/abap.py +++ b/pygments/styles/abap.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.abap ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/algol.py b/pygments/styles/algol.py index bf92e538..f293b0ec 100644 --- a/pygments/styles/algol.py +++ b/pygments/styles/algol.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.algol ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/algol_nu.py b/pygments/styles/algol_nu.py index b5428f81..fe284669 100644 --- a/pygments/styles/algol_nu.py +++ b/pygments/styles/algol_nu.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.algol_nu ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/arduino.py b/pygments/styles/arduino.py index 06e3f007..4dfe0f3c 100644 --- a/pygments/styles/arduino.py +++ b/pygments/styles/arduino.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.arduino ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/autumn.py b/pygments/styles/autumn.py index 5584ccd1..85fd8982 100644 --- a/pygments/styles/autumn.py +++ b/pygments/styles/autumn.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.autumn ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/borland.py b/pygments/styles/borland.py index c9e546af..427e149f 100644 --- a/pygments/styles/borland.py +++ b/pygments/styles/borland.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.borland ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/bw.py b/pygments/styles/bw.py index e1a324f8..1b385387 100644 --- a/pygments/styles/bw.py +++ b/pygments/styles/bw.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.bw ~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/colorful.py b/pygments/styles/colorful.py index a54754e7..a67b8e3e 100644 --- a/pygments/styles/colorful.py +++ b/pygments/styles/colorful.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.colorful ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/default.py b/pygments/styles/default.py index 61a3ec0c..414de2f0 100644 --- a/pygments/styles/default.py +++ b/pygments/styles/default.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.default ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/emacs.py b/pygments/styles/emacs.py index 9660f59d..e9cbc33d 100644 --- a/pygments/styles/emacs.py +++ b/pygments/styles/emacs.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.emacs ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/friendly.py b/pygments/styles/friendly.py index 19bd5b02..86dd514d 100644 --- a/pygments/styles/friendly.py +++ b/pygments/styles/friendly.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.friendly ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/fruity.py b/pygments/styles/fruity.py index 1372e19d..2446915d 100644 --- a/pygments/styles/fruity.py +++ b/pygments/styles/fruity.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.fruity ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/igor.py b/pygments/styles/igor.py index 9f8fecc7..278e9da1 100644 --- a/pygments/styles/igor.py +++ b/pygments/styles/igor.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.igor ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/inkpot.py b/pygments/styles/inkpot.py index 1fc3bedb..d2eff2c8 100644 --- a/pygments/styles/inkpot.py +++ b/pygments/styles/inkpot.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.inkpot ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/lovelace.py b/pygments/styles/lovelace.py index 7bc37f54..ec8d2a91 100644 --- a/pygments/styles/lovelace.py +++ b/pygments/styles/lovelace.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.lovelace ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/manni.py b/pygments/styles/manni.py index 22138ad7..167dcebd 100644 --- a/pygments/styles/manni.py +++ b/pygments/styles/manni.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.manni ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/monokai.py b/pygments/styles/monokai.py index cdfd24f0..9d69ec0b 100644 --- a/pygments/styles/monokai.py +++ b/pygments/styles/monokai.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.monokai ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/murphy.py b/pygments/styles/murphy.py index 10e9a182..9115c2d8 100644 --- a/pygments/styles/murphy.py +++ b/pygments/styles/murphy.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.murphy ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/native.py b/pygments/styles/native.py index be50484d..d990389b 100644 --- a/pygments/styles/native.py +++ b/pygments/styles/native.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.native ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/paraiso_dark.py b/pygments/styles/paraiso_dark.py index 42ca447d..25561395 100644 --- a/pygments/styles/paraiso_dark.py +++ b/pygments/styles/paraiso_dark.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.paraiso_dark ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/paraiso_light.py b/pygments/styles/paraiso_light.py index 02cb3ff1..608d1734 100644 --- a/pygments/styles/paraiso_light.py +++ b/pygments/styles/paraiso_light.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.paraiso_light ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/pastie.py b/pygments/styles/pastie.py index a5d4f694..14ec7007 100644 --- a/pygments/styles/pastie.py +++ b/pygments/styles/pastie.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.pastie ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/perldoc.py b/pygments/styles/perldoc.py index 94c47539..5eae210f 100644 --- a/pygments/styles/perldoc.py +++ b/pygments/styles/perldoc.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.perldoc ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/rainbow_dash.py b/pygments/styles/rainbow_dash.py index d4041324..3996332a 100644 --- a/pygments/styles/rainbow_dash.py +++ b/pygments/styles/rainbow_dash.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.rainbow_dash ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/rrt.py b/pygments/styles/rrt.py index a9e62d4b..455f1d94 100644 --- a/pygments/styles/rrt.py +++ b/pygments/styles/rrt.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.rrt ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/sas.py b/pygments/styles/sas.py index 40b45e24..f6203534 100644 --- a/pygments/styles/sas.py +++ b/pygments/styles/sas.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.sas ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/solarized.py b/pygments/styles/solarized.py index ef0c1126..d0402541 100644 --- a/pygments/styles/solarized.py +++ b/pygments/styles/solarized.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.solarized ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/stata_dark.py b/pygments/styles/stata_dark.py index 8fae7329..073f0131 100644 --- a/pygments/styles/stata_dark.py +++ b/pygments/styles/stata_dark.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.stata_dark ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/stata_light.py b/pygments/styles/stata_light.py index 5eda6d96..9dead703 100644 --- a/pygments/styles/stata_light.py +++ b/pygments/styles/stata_light.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.stata_light ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/tango.py b/pygments/styles/tango.py index bc727951..694e2777 100644 --- a/pygments/styles/tango.py +++ b/pygments/styles/tango.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.tango ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/trac.py b/pygments/styles/trac.py index ff2f8dcb..b2a1fd4d 100644 --- a/pygments/styles/trac.py +++ b/pygments/styles/trac.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.trac ~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/vim.py b/pygments/styles/vim.py index 3176d452..f498606b 100644 --- a/pygments/styles/vim.py +++ b/pygments/styles/vim.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.vim ~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/vs.py b/pygments/styles/vs.py index b85c7e84..a504f912 100644 --- a/pygments/styles/vs.py +++ b/pygments/styles/vs.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.vs ~~~~~~~~~~~~~~~~~~ diff --git a/pygments/styles/xcode.py b/pygments/styles/xcode.py index dd0beb19..fd8621e7 100644 --- a/pygments/styles/xcode.py +++ b/pygments/styles/xcode.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.styles.xcode ~~~~~~~~~~~~~~~~~~~~~ diff --git a/pygments/token.py b/pygments/token.py index f7e107d9..9013acb7 100644 --- a/pygments/token.py +++ b/pygments/token.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.token ~~~~~~~~~~~~~~ diff --git a/pygments/unistring.py b/pygments/unistring.py index 908beca4..4db9c7ce 100644 --- a/pygments/unistring.py +++ b/pygments/unistring.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.unistring ~~~~~~~~~~~~~~~~~~ diff --git a/pygments/util.py b/pygments/util.py index e6f9ed71..5d6ddc3f 100644 --- a/pygments/util.py +++ b/pygments/util.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ pygments.util ~~~~~~~~~~~~~ diff --git a/scripts/check_crlf.py b/scripts/check_crlf.py index 880b496b..055446cf 100644 --- a/scripts/check_crlf.py +++ b/scripts/check_crlf.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- """ Checker for line endings ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/scripts/check_sources.py b/scripts/check_sources.py index 21564415..2b79cfe6 100755 --- a/scripts/check_sources.py +++ b/scripts/check_sources.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- """ Checker for file headers ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -188,7 +187,7 @@ def main(argv): try: with open(fn, 'rb') as f: lines = f.read().decode('utf-8').splitlines() - except (IOError, OSError) as err: + except OSError as err: print("%s: cannot open: %s" % (fn, err)) num += 1 continue diff --git a/scripts/debug_lexer.py b/scripts/debug_lexer.py index e173d344..a76265f5 100755 --- a/scripts/debug_lexer.py +++ b/scripts/debug_lexer.py @@ -1,5 +1,4 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- """ Lexing error finder ~~~~~~~~~~~~~~~~~~~ diff --git a/scripts/vim2pygments.py b/scripts/vim2pygments.py index 50d69bc6..2364e32a 100755 --- a/scripts/vim2pygments.py +++ b/scripts/vim2pygments.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- """ Vim Colorscheme Converter ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/__init__.py b/tests/__init__.py index 50d4621b..0b017eee 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments test package ~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/support/empty.py b/tests/support/empty.py index 40a96afc..e69de29b 100644 --- a/tests/support/empty.py +++ b/tests/support/empty.py @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/tests/support/html_formatter.py b/tests/support/html_formatter.py index 169cd4af..5f04fd57 100644 --- a/tests/support/html_formatter.py +++ b/tests/support/html_formatter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from pygments.formatters import HtmlFormatter diff --git a/tests/support/python_lexer.py b/tests/support/python_lexer.py index 565ee674..78d9c4ad 100644 --- a/tests/support/python_lexer.py +++ b/tests/support/python_lexer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # pygments.lexers.python (as CustomLexer) for test_cmdline.py from pygments.lexers import PythonLexer diff --git a/tests/test_analyze_lexer.py b/tests/test_analyze_lexer.py index 0391507e..d2dba038 100644 --- a/tests/test_analyze_lexer.py +++ b/tests/test_analyze_lexer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments basic API tests ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -17,8 +16,7 @@ TESTDIR = path.dirname(path.abspath(__file__)) def _guess_lexer_for_file(filename): - return lexers.guess_lexer(open(path.join(TESTDIR, 'examplefiles', filename), - 'r', encoding='utf-8').read()) + return lexers.guess_lexer(open(path.join(TESTDIR, 'examplefiles', filename), encoding='utf-8').read()) @pytest.mark.skip(reason="This is identified as T-SQL") diff --git a/tests/test_apache_conf.py b/tests/test_apache_conf.py index a19cb842..94aebc9a 100644 --- a/tests/test_apache_conf.py +++ b/tests/test_apache_conf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic Apache Configuration Test ~~~~~~~~~~~~~~~~~-------------- diff --git a/tests/test_asm.py b/tests/test_asm.py index b972c102..6c5665bb 100644 --- a/tests/test_asm.py +++ b/tests/test_asm.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic GasLexer/NasmLexer Test ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_basic.py b/tests/test_basic.py index fd054ddb..4488d34e 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments Basic lexers tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_basic_api.py b/tests/test_basic_api.py index b860060b..24e42ca2 100644 --- a/tests/test_basic_api.py +++ b/tests/test_basic_api.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments basic API tests ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -186,7 +185,7 @@ def test_formatter_encodings(): # encoding and outencoding option fmt = HtmlFormatter(encoding="latin1", outencoding="utf8") tokens = [(Text, "ä")] - assert "ä".encode("utf8") in format(tokens, fmt) + assert "ä".encode() in format(tokens, fmt) @pytest.mark.parametrize('cls', [getattr(formatters, name) @@ -272,7 +271,7 @@ class TestFilters: # We don't read as binary and decode, but instead read as text, as # we need consistent line endings. Otherwise we'll get \r\n on # Windows - with open(TESTFILE, 'r', encoding='utf-8') as fp: + with open(TESTFILE, encoding='utf-8') as fp: text = fp.read() tokens = list(lx.get_tokens(text)) assert all(isinstance(t[1], str) for t in tokens), \ diff --git a/tests/test_bibtex.py b/tests/test_bibtex.py index b56eccf3..e47869d5 100644 --- a/tests/test_bibtex.py +++ b/tests/test_bibtex.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ BibTeX Test ~~~~~~~~~~~ diff --git a/tests/test_cfm.py b/tests/test_cfm.py index 54cf502c..096bc876 100644 --- a/tests/test_cfm.py +++ b/tests/test_cfm.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic ColdfusionHtmlLexer Test ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_clexer.py b/tests/test_clexer.py index c636f7f2..dba1e40e 100644 --- a/tests/test_clexer.py +++ b/tests/test_clexer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic CLexer Test ~~~~~~~~~~~~~~~~~ diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 731729d9..b92a9035 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Command line test ~~~~~~~~~~~~~~~~~ diff --git a/tests/test_coffeescript.py b/tests/test_coffeescript.py index 60ddfcd8..5d69a8aa 100644 --- a/tests/test_coffeescript.py +++ b/tests/test_coffeescript.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ CoffeeScript tests ~~~~~~~~~~~~~~~~~~ @@ -54,17 +53,17 @@ def test_coffee_slashes(lexer, golden): def test_mixed_slashes(lexer): - fragment = u'a?/foo/:1/2;\n' + fragment = 'a?/foo/:1/2;\n' tokens = [ - (Token.Name.Other, u'a'), - (Token.Operator, u'?'), - (Token.Literal.String.Regex, u'/foo/'), - (Token.Operator, u':'), - (Token.Literal.Number.Integer, u'1'), - (Token.Operator, u'/'), - (Token.Literal.Number.Integer, u'2'), - (Token.Punctuation, u';'), - (Token.Text, u'\n'), + (Token.Name.Other, 'a'), + (Token.Operator, '?'), + (Token.Literal.String.Regex, '/foo/'), + (Token.Operator, ':'), + (Token.Literal.Number.Integer, '1'), + (Token.Operator, '/'), + (Token.Literal.Number.Integer, '2'), + (Token.Punctuation, ';'), + (Token.Text, '\n'), ] assert list(lexer.get_tokens(fragment)) == tokens diff --git a/tests/test_cpp.py b/tests/test_cpp.py index e847079d..7b6d4db4 100644 --- a/tests/test_cpp.py +++ b/tests/test_cpp.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ CPP Tests ~~~~~~~~~ diff --git a/tests/test_crystal.py b/tests/test_crystal.py index ae0dd7ff..91ec8007 100644 --- a/tests/test_crystal.py +++ b/tests/test_crystal.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic CrystalLexer Test ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_csound.py b/tests/test_csound.py index cee0784a..efb387c2 100644 --- a/tests/test_csound.py +++ b/tests/test_csound.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Csound lexer tests ~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_data.py b/tests/test_data.py index 5388910a..83e7c09e 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Data Tests ~~~~~~~~~~ diff --git a/tests/test_examplefiles.py b/tests/test_examplefiles.py index 102c154d..e4510ec4 100644 --- a/tests/test_examplefiles.py +++ b/tests/test_examplefiles.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments tests with example files ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_ezhil.py b/tests/test_ezhil.py index beca4c65..7e1ee579 100644 --- a/tests/test_ezhil.py +++ b/tests/test_ezhil.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic EzhilLexer Test ~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_gdscript.py b/tests/test_gdscript.py index d52d8ff8..bed0fec1 100644 --- a/tests/test_gdscript.py +++ b/tests/test_gdscript.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ GDScript Tests ~~~~~~~~~~~~~~ diff --git a/tests/test_grammar_notation.py b/tests/test_grammar_notation.py index 1ac35f53..b0c56c82 100644 --- a/tests/test_grammar_notation.py +++ b/tests/test_grammar_notation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic Grammar Notation Tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_haskell.py b/tests/test_haskell.py index a9a15bb3..c271d8b4 100644 --- a/tests/test_haskell.py +++ b/tests/test_haskell.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Haskell Tests ~~~~~~~~~~~~~ diff --git a/tests/test_hdl.py b/tests/test_hdl.py index cad3f348..3411147f 100644 --- a/tests/test_hdl.py +++ b/tests/test_hdl.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ HDL Tests ~~~~~~~~~ diff --git a/tests/test_html_formatter.py b/tests/test_html_formatter.py index 5138a1ce..3ed53e53 100644 --- a/tests/test_html_formatter.py +++ b/tests/test_html_formatter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments HTML formatter tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -24,7 +23,7 @@ from pygments.style import Style TESTDIR = path.dirname(path.abspath(__file__)) TESTFILE = path.join(TESTDIR, 'test_html_formatter.py') -with io.open(TESTFILE, encoding='utf-8') as fp: +with open(TESTFILE, encoding='utf-8') as fp: tokensource = list(PythonLexer().get_tokens(fp.read())) @@ -54,7 +53,7 @@ def test_external_css(): try: fmt2.format(tokensource, tfile) assert path.isfile(path.join(TESTDIR, 'fmt2.css')) - except IOError: + except OSError: # test directory not writable pass tfile.close() diff --git a/tests/test_html_lexer.py b/tests/test_html_lexer.py index 62f1c8d4..cdab6310 100644 --- a/tests/test_html_lexer.py +++ b/tests/test_html_lexer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ HTML Lexer Tests ~~~~~~~~~~~~~~~~ diff --git a/tests/test_idris.py b/tests/test_idris.py index 42dcb3cb..e8c4b6de 100644 --- a/tests/test_idris.py +++ b/tests/test_idris.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic IdrisLexer Test ~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_inherit.py b/tests/test_inherit.py index 322ac148..74d04b7d 100644 --- a/tests/test_inherit.py +++ b/tests/test_inherit.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Tests for inheritance in RegexLexer ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_irc_formatter.py b/tests/test_irc_formatter.py index d43e1122..4f0e9570 100644 --- a/tests/test_irc_formatter.py +++ b/tests/test_irc_formatter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments IRC formatter tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_java.py b/tests/test_java.py index f618f503..410c25ab 100644 --- a/tests/test_java.py +++ b/tests/test_java.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic JavaLexer Test ~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_javascript.py b/tests/test_javascript.py index ea0691d6..35225142 100644 --- a/tests/test_javascript.py +++ b/tests/test_javascript.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Javascript tests ~~~~~~~~~~~~~~~~ diff --git a/tests/test_julia.py b/tests/test_julia.py index 4c6be538..ee928861 100644 --- a/tests/test_julia.py +++ b/tests/test_julia.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Julia Tests ~~~~~~~~~~~ diff --git a/tests/test_kotlin.py b/tests/test_kotlin.py index 2c6c069c..8d67f83d 100644 --- a/tests/test_kotlin.py +++ b/tests/test_kotlin.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic JavaLexer Test ~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_latex_formatter.py b/tests/test_latex_formatter.py index 6609c6da..d22499aa 100644 --- a/tests/test_latex_formatter.py +++ b/tests/test_latex_formatter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments LaTeX formatter tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_lexers_other.py b/tests/test_lexers_other.py index b9292e30..910df9a9 100644 --- a/tests/test_lexers_other.py +++ b/tests/test_lexers_other.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Tests for other lexers ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_make.py b/tests/test_make.py index cab0b1d8..70f368e3 100644 --- a/tests/test_make.py +++ b/tests/test_make.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ CMake Tests ~~~~~~~~~~~ diff --git a/tests/test_markdown_lexer.py b/tests/test_markdown_lexer.py index 7bffa9ea..32457b5a 100644 --- a/tests/test_markdown_lexer.py +++ b/tests/test_markdown_lexer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments Markdown lexer tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_matlab.py b/tests/test_matlab.py index 8f73e71e..945a3434 100644 --- a/tests/test_matlab.py +++ b/tests/test_matlab.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ MATLAB Tests ~~~~~~~~~~~ diff --git a/tests/test_modeline.py b/tests/test_modeline.py index 763a014e..9fa7c849 100644 --- a/tests/test_modeline.py +++ b/tests/test_modeline.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Tests for the vim modeline feature ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_mysql.py b/tests/test_mysql.py index 195140a5..c71cfb45 100644 --- a/tests/test_mysql.py +++ b/tests/test_mysql.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments MySQL lexer tests ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_objectiveclexer.py b/tests/test_objectiveclexer.py index 6940e4ca..d4ea6126 100644 --- a/tests/test_objectiveclexer.py +++ b/tests/test_objectiveclexer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic CLexer Test ~~~~~~~~~~~~~~~~~ diff --git a/tests/test_perllexer.py b/tests/test_perllexer.py index dfab6dae..7c05ea88 100644 --- a/tests/test_perllexer.py +++ b/tests/test_perllexer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments regex lexer tests ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_php.py b/tests/test_php.py index 6c2c9c90..fe67f4c2 100644 --- a/tests/test_php.py +++ b/tests/test_php.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ PHP Tests ~~~~~~~~~ diff --git a/tests/test_praat.py b/tests/test_praat.py index 3586236d..cb2758be 100644 --- a/tests/test_praat.py +++ b/tests/test_praat.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Praat lexer tests ~~~~~~~~~~~~~~~~~ diff --git a/tests/test_promql.py b/tests/test_promql.py index 4bd3d59f..5d04b6bb 100644 --- a/tests/test_promql.py +++ b/tests/test_promql.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic PromQLLexer Tests ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_properties.py b/tests/test_properties.py index 3d7cdac3..5da3fb86 100644 --- a/tests/test_properties.py +++ b/tests/test_properties.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Properties Tests ~~~~~~~~~~~~~~~~ diff --git a/tests/test_python.py b/tests/test_python.py index ee36a331..12529d4a 100644 --- a/tests/test_python.py +++ b/tests/test_python.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Python Tests ~~~~~~~~~~~~ diff --git a/tests/test_qbasiclexer.py b/tests/test_qbasiclexer.py index c15fd93e..cedeb93f 100644 --- a/tests/test_qbasiclexer.py +++ b/tests/test_qbasiclexer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Tests for QBasic ~~~~~~~~~~~~~~~~ diff --git a/tests/test_r.py b/tests/test_r.py index 663abbfa..ffd3f576 100644 --- a/tests/test_r.py +++ b/tests/test_r.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ R Tests ~~~~~~~ diff --git a/tests/test_rdf.py b/tests/test_rdf.py index fed18b30..e4c9d1ec 100644 --- a/tests/test_rdf.py +++ b/tests/test_rdf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic RubyLexer Test ~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_regexlexer.py b/tests/test_regexlexer.py index a535a38a..45ae20b1 100644 --- a/tests/test_regexlexer.py +++ b/tests/test_regexlexer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments regex lexer tests ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_regexopt.py b/tests/test_regexopt.py index 56fb7d54..22440b11 100644 --- a/tests/test_regexopt.py +++ b/tests/test_regexopt.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Tests for pygments.regexopt ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_rtf_formatter.py b/tests/test_rtf_formatter.py index 16d2c88b..a6c048cd 100644 --- a/tests/test_rtf_formatter.py +++ b/tests/test_rtf_formatter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments RTF formatter tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_ruby.py b/tests/test_ruby.py index b52ab2f5..98654cc4 100644 --- a/tests/test_ruby.py +++ b/tests/test_ruby.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic RubyLexer Test ~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_shell.py b/tests/test_shell.py index 3445b6bb..7704c7eb 100644 --- a/tests/test_shell.py +++ b/tests/test_shell.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic Shell Tests ~~~~~~~~~~~~~~~~~ diff --git a/tests/test_smarty.py b/tests/test_smarty.py index fde9d69d..b7f7cc72 100644 --- a/tests/test_smarty.py +++ b/tests/test_smarty.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic SmartyLexer Test ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_sql.py b/tests/test_sql.py index 5a2cadb8..590b0cd5 100644 --- a/tests/test_sql.py +++ b/tests/test_sql.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments SQL lexers tests ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_terminal_formatter.py b/tests/test_terminal_formatter.py index 9291ecbc..edc704d8 100644 --- a/tests/test_terminal_formatter.py +++ b/tests/test_terminal_formatter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments terminal formatter tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_textfmts.py b/tests/test_textfmts.py index f47f4e3c..f50a302e 100644 --- a/tests/test_textfmts.py +++ b/tests/test_textfmts.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic Tests for textfmts ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_tnt.py b/tests/test_tnt.py index 3e217e3b..0dcfef39 100644 --- a/tests/test_tnt.py +++ b/tests/test_tnt.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Typograhic Number Theory tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_token.py b/tests/test_token.py index 14ab8af5..9f08fc25 100644 --- a/tests/test_token.py +++ b/tests/test_token.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Test suite for the token module ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_unistring.py b/tests/test_unistring.py index f10a3f0e..cf58d10d 100644 --- a/tests/test_unistring.py +++ b/tests/test_unistring.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Test suite for the unistring module ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_usd.py b/tests/test_usd.py index 8edebeab..ed474af1 100755 --- a/tests/test_usd.py +++ b/tests/test_usd.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- """Test that syntax highlighting for USD files works correctly.""" diff --git a/tests/test_using_api.py b/tests/test_using_api.py index c87aa8bc..40ed189d 100644 --- a/tests/test_using_api.py +++ b/tests/test_using_api.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Pygments tests for using() ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_util.py b/tests/test_util.py index 899fc6d6..eb744381 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Test suite for the util module ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -156,7 +155,7 @@ def test_duplicates_removed_nonconsecutive(): def test_guess_decode(): # UTF-8 should be decoded as UTF-8 - s = util.guess_decode('\xff'.encode('utf-8')) + s = util.guess_decode('\xff'.encode()) assert s == ('\xff', 'utf-8') # otherwise, it could be latin1 or the locale encoding... @@ -172,7 +171,7 @@ def test_guess_decode_from_terminal(): s = util.guess_decode_from_terminal('\xff'.encode('utf-7'), Term) assert s == ('\xff', 'utf-7') - s = util.guess_decode_from_terminal('\xff'.encode('utf-8'), Term) + s = util.guess_decode_from_terminal('\xff'.encode(), Term) assert s == ('\xff', 'utf-8') diff --git a/tests/test_whiley.py b/tests/test_whiley.py index 82abee38..cc8248e8 100644 --- a/tests/test_whiley.py +++ b/tests/test_whiley.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Whiley Test ~~~~~~~~~~~ diff --git a/tests/test_yang.py b/tests/test_yang.py index 6dfab593..20bbaca6 100644 --- a/tests/test_yang.py +++ b/tests/test_yang.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Basic Yang Test ~~~~~~~~~~~~~~~~~~~~ |