dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1659 from BuhtigithuB/improve/pep8-decoder-py

Browse Source 
Enhance decoder.py PEP8
This commit is contained in:
mdipierro
2017-07-10 14:13:04 -05:00
committed by GitHub
parent 01285ad4cd a8fb41333b
commit 023d7f3e6c
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/decoder.py
+12 -13
View File
@@ -15,13 +15,13 @@ import codecs
# None represents a potentially variable byte. "##" in the XML spec... # None represents a potentially variable byte. "##" in the XML spec...
autodetect_dict = { # bytepattern : ("name", autodetect_dict = { # bytepattern : ("name",
(0x00, 0x00, 0xFE, 0xFF): ("ucs4_be"), (0x00, 0x00, 0xFE, 0xFF): ("ucs4_be"),
(0xFF, 0xFE, 0x00, 0x00): ("ucs4_le"), (0xFF, 0xFE, 0x00, 0x00): ("ucs4_le"),
(0xFE, 0xFF, None, None): ("utf_16_be"), (0xFE, 0xFF, None, None): ("utf_16_be"),
(0xFF, 0xFE, None, None): ("utf_16_le"), (0xFF, 0xFE, None, None): ("utf_16_le"),
(0x00, 0x3C, 0x00, 0x3F): ("utf_16_be"), (0x00, 0x3C, 0x00, 0x3F): ("utf_16_be"),
(0x3C, 0x00, 0x3F, 0x00): ("utf_16_le"), (0x3C, 0x00, 0x3F, 0x00): ("utf_16_le"),
(0x3C, 0x3F, 0x78, 0x6D): ("utf_8"), (0x3C, 0x3F, 0x78, 0x6D): ("utf_8"),
(0x4C, 0x6F, 0xA7, 0x94): ("EBCDIC") (0x4C, 0x6F, 0xA7, 0x94): ("EBCDIC")
} }
@@ -36,10 +36,10 @@ def autoDetectXMLEncoding(buffer):
# buffer at once but otherwise we'd have to decode a character at # buffer at once but otherwise we'd have to decode a character at
# a time looking for the quote character...that's a pain # a time looking for the quote character...that's a pain
encoding = "utf_8" # according to the XML spec, this is the default encoding = "utf_8"
# this code successively tries to refine the default # according to the XML spec, this is the default this code successively tries to refine the default
# whenever it fails to refine, it falls back to # whenever it fails to refine, it falls back to the last place encoding was set.
# the last place encoding was set.
if len(buffer) >= 4: if len(buffer) >= 4:
bytes = (byte1, byte2, byte3, byte4) = tuple(map(ord, buffer[0:4])) bytes = (byte1, byte2, byte3, byte4) = tuple(map(ord, buffer[0:4]))
enc_info = autodetect_dict.get(bytes, None) enc_info = autodetect_dict.get(bytes, None)
@@ -51,8 +51,7 @@ def autoDetectXMLEncoding(buffer):
enc_info = None enc_info = None
if enc_info: if enc_info:
encoding = enc_info # we've got a guess... these are encoding = enc_info # we've got a guess... these are the new defaults
#the new defaults
# try to find a more precise encoding using xml declaration # try to find a more precise encoding using xml declaration
secret_decoder_ring = codecs.lookup(encoding)[1] secret_decoder_ring = codecs.lookup(encoding)[1]