--- a/ThirdParty/Pygments/pygments/lexers/_postgres_builtins.py Sun Feb 17 19:05:40 2013 +0100 +++ b/ThirdParty/Pygments/pygments/lexers/_postgres_builtins.py Sun Feb 17 19:07:15 2013 +0100 @@ -1,10 +1,11 @@ +# -*- coding: utf-8 -*- """ pygments.lexers._postgres_builtins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Self-updating data files for PostgreSQL lexer. - :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ @@ -41,7 +42,6 @@ def parse_datatypes(f): dt = set() - re_entry = re.compile('\s*<entry><type>([^<]+)</type></entry>') for line in f: if '<sect1' in line: break @@ -57,7 +57,8 @@ line = re.sub("<[^>]+>", "", line) # Drop the parts containing braces - for tmp in [ t for tmp in line.split('[') for t in tmp.split(']') if "(" not in t ]: + for tmp in [t for tmp in line.split('[') + for t in tmp.split(']') if "(" not in t]: for t in tmp.split(','): t = t.strip() if not t: continue @@ -204,17 +205,18 @@ 'bigint', 'bigserial', 'bit', 'bit varying', 'bool', 'boolean', 'box', 'bytea', 'char', 'character', 'character varying', 'cidr', 'circle', 'date', 'decimal', 'double precision', 'float4', 'float8', 'inet', - 'int', 'int2', 'int4', 'int8', 'integer', 'interval', 'line', 'lseg', - 'macaddr', 'money', 'numeric', 'path', 'point', 'polygon', 'real', - 'serial', 'serial4', 'serial8', 'smallint', 'text', 'time', 'timestamp', - 'timestamptz', 'timetz', 'tsquery', 'tsvector', 'txid_snapshot', 'uuid', - 'varbit', 'varchar', 'with time zone', 'without time zone', 'xml', + 'int', 'int2', 'int4', 'int8', 'integer', 'interval', 'json', 'line', + 'lseg', 'macaddr', 'money', 'numeric', 'path', 'point', 'polygon', + 'real', 'serial', 'serial2', 'serial4', 'serial8', 'smallint', + 'smallserial', 'text', 'time', 'timestamp', 'timestamptz', 'timetz', + 'tsquery', 'tsvector', 'txid_snapshot', 'uuid', 'varbit', 'varchar', + 'with time zone', 'without time zone', 'xml', ] PSEUDO_TYPES = [ - 'any', 'anyarray', 'anyelement', 'anyenum', 'anynonarray', 'cstring', - 'internal', 'language_handler', 'fdw_handler', 'record', 'trigger', - 'void', 'opaque', + 'any', 'anyelement', 'anyarray', 'anynonarray', 'anyenum', 'anyrange', + 'cstring', 'internal', 'language_handler', 'fdw_handler', 'record', + 'trigger', 'void', 'opaque', ] # Remove 'trigger' from types