Update expected test results

Signed-off-by: Jono Yang <jyang@nexb.com

Author: JonoYang

src/typecode/prog_lexers.py

@@ -347,7 +347,7 @@
     #'PugLexer': ('pygments.lexers.html', 'Pug', ('pug', 'jade'), ('*.pug', '*.jade'), ('text/x-pug', 'text/x-jade')),
     #'PuppetLexer': ('pygments.lexers.dsls', 'Puppet', ('puppet',), ('*.pp',), ()),
     #'PyPyLogLexer': ('pygments.lexers.console', 'PyPy Log', ('pypylog', 'pypy'), ('*.pypylog',), ('application/x-pypylog',)),
-    #'Python3Lexer': ('pygments.lexers.python', 'Python 3', ('python3', 'py3'), (), ('text/x-python3', 'application/x-python3')),
+    'Python3Lexer': ('pygments.lexers.python', 'Python 3', ('python3', 'py3'), (), ('text/x-python3', 'application/x-python3')),
     #'Python3TracebackLexer': ('pygments.lexers.python', 'Python 3.0 Traceback', ('py3tb',), ('*.py3tb',), ('text/x-python3-traceback',)),
     #'PythonConsoleLexer': ('pygments.lexers.python', 'Python console session', ('pycon',), (), ('text/x-python-doctest',)),
     'PythonLexer': ('pygments.lexers.python', 'Python', ('python', 'py', 'sage'), ('*.py', '*.pyw', '*.sc', 'SConstruct', 'SConscript', '*.tac', '*.sage'), ('text/x-python', 'application/x-python')),

src/typecode/pygments_lexers.py

@@ -15,7 +15,7 @@
 import fnmatch
 from os.path import basename
 
-from pygments.lexers._mapping import LEXERS
+from typecode.prog_lexers import LEXERS
 from pygments.modeline import get_filetype_from_buffer
 from pygments.plugin import find_plugin_lexers
 from pygments.util import ClassNotFound, itervalues, guess_decode, text_type

tests/typecode/data/filetest/archive/a.tar.gz.yml

@@ -1,4 +1,5 @@
-filetype_file: gzip compressed data
+filetype_file: 'gzip compressed data, last modified: Tue Jul 29 18:56:56 2008, from Unix, original
+  size modulo 2^32 10240'
 mimetype_file: application/gzip
 mimetype_python: application/x-tar
 is_file: yes

tests/typecode/data/filetest/archive/e.tar.gz.yml

@@ -1,4 +1,5 @@
-filetype_file: gzip compressed data
+filetype_file: 'gzip compressed data, last modified: Tue Sep 9 01:32:36 2008, from Unix, original
+  size modulo 2^32 10240'
 mimetype_file: application/gzip
 mimetype_python: application/x-tar
 is_file: yes

tests/typecode/data/filetest/archive/file_4.26-1.diff.gz.yml

@@ -1,4 +1,5 @@
-filetype_file: gzip compressed data
+filetype_file: 'gzip compressed data, last modified: Mon Sep 8 12:04:26 2008, max compression,
+  from Unix, original size modulo 2^32 150165'
 mimetype_file: application/gzip
 is_file: yes
 is_regular: yes

tests/typecode/data/filetest/code/java/CommonViewerSiteFactory.jad.yml

@@ -1,6 +1,8 @@
 filetype_file: Java source, ASCII text
 mimetype_file: text/x-java
 mimetype_python: text/vnd.sun.j2me.app-descriptor
+filetype_pygment: Python
+programming_language: Python
 is_file: yes
 is_regular: yes
 size: 1447

tests/typecode/data/filetest/compiled/linux/i686-shash.yml

@@ -1,4 +1,5 @@
-filetype_file: ELF 32-bit LSB executable, Intel 80386
+filetype_file: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked,
+  interpreter /lib/ld-linux.so.2, for GNU/Linux 2.6.4, with debug_info, not stripped
 mimetype_file: application/x-executable
 elf_type: executable
 is_file: yes

tests/typecode/data/filetest/compiled/linux/x86_64-shash.yml

@@ -1,4 +1,5 @@
-filetype_file: ELF 64-bit LSB executable, x86-64
+filetype_file: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked, interpreter
+  /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.9, not stripped
 mimetype_file: application/x-executable
 elf_type: executable
 is_file: yes

tests/typecode/data/filetest/data/mysql-arch.ARZ.yml

@@ -1,4 +1,4 @@
-filetype_file: gzip compressed data
+filetype_file: gzip compressed data, from Unix, original size modulo 2^32 305
 mimetype_file: application/gzip
 is_file: yes
 is_regular: yes

tests/typecode/data/filetest/data/mysql-arch.yml

@@ -1,4 +1,4 @@
-filetype_file: MySQL table definition file
+filetype_file: MySQL table definition file Version 224, type DIAM_ISAM, MySQL version -1515870811
 mimetype_file: application/octet-stream
 is_file: yes
 is_regular: yes