diff --git a/netarch/__init__.py b/netarch/__init__.py index 74d8016..6317f23 100644 --- a/netarch/__init__.py +++ b/netarch/__init__.py @@ -41,23 +41,6 @@ decch = (u'␀␁␂␃␄␅␆␇␈␉␊␋␌␍␎␏' u'················' u'················') -cgach = (u'␀☺☻♥♦♣♠•◘○◙♂♀♪♫☼' - u'►◄↕‼¶§▬↨↑↓→←∟↔▲▼' - u' !"#$%&\'()*+,-./' - u'0123456789:;<=>?' - u'@ABCDEFGHIJKLMNO' - u'PQRSTUVWXYZ[\]^_' - u'`abcdefghijklmno' - u'pqrstuvwxyz{|}~⌂' - u'ÇüéâäàåçêëèïîìÄÅ' - u'ÉæÆôöòûùÿÖÜ¢£¥₧ƒ' - u'áíóúñѪº¿⌐¬½¼¡«»' - u'░▒▓│┤╡╢╖╕╣║╗╝╜╛┐' - u'└┴┬├─┼╞╟╚╔╩╦╠═╬╧' - u'╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀' - u'αßΓπΣσµτΦΘΩδ∞φε∩' - u'≡±≥≤⌠⌡÷≈°∙·√ⁿ²■¤') - shpch = (u'␀☺☻♥♦♣♠•◘○◙♂♀♪♫☼' u'►◄↕‼¶§▬↨↑↓→←∟↔▲▼' u'␣!"#$%&\'()*+,-./' @@ -75,7 +58,22 @@ shpch = (u'␀☺☻♥♦♣♠•◘○◙♂♀♪♫☼' u'αßΓπΣσµτΦΘΩδ∞φε∩' u'≡±≥≤⌠⌡÷≈°∙·√ⁿ²■¤') - +dbch = (u'·☺☻♥♦♣♠•◘○◙♂♀♪♫☼' + u'►◄↕‼¶§▬↨↑↓→←∟↔▲▼' + u' !"#$%&\'()*+,-./' + u'0123456789:;<=>?' + u'@ABCDEFGHIJKLMNO' + u'PQRSTUVWXYZ[\]^_' + u'`abcdefghijklmno' + u'pqrstuvwxyz{|}~⌂' + u'ÇüéâäàåçêëèïîìÄÅ' + u'ÉæÆôöòûùÿÖÜ¢£¥€ƒ' + u'áíóúñѪº½⅓¼⅕⅙⅛«»' + u'░▒▓│┤╡╢╖╕╣║╗╝╜╛┐' + u'└┴┬├─┼╞╟╚╔╩╦╠═╬╧' + u'╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀' + u'αßΓπΣσµτΦΘΩδ∞φε∩' + u'⁰¹²³⁴⁵⁶⁷⁸⁹ⁱⁿ⁽⁼⁾¤') def unpack(fmt, buf): """Unpack buf based on fmt, return the rest as a string.""" @@ -95,8 +93,7 @@ class HexDumper(object): if not c: return u'◌' else: - return cgach[ord(c)] - + return dbch[ord(c)] def write(self, what): self.fd.write(what.encode('utf-8'))