Lil-Ran/Pyarmor-Static-Unpack-1shot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Print unicode as default in Python 2.x when CO_FUTURE_UNICODE_LITERALS

Browse Source 
is set.

Fixes #141.
This commit is contained in:
Michael Hansen
2019-10-06 14:34:24 -07:00
parent 892616b560
commit 8014ac2b14
7 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bytecode.cpp
View File

@@ -151,10 +151,10 @@ void print_const(PycRef<PycObject> obj, PycModule* mod)
switch (obj->type()) {
case PycObject::TYPE_STRING:
OutputString(obj.cast<PycString>(), (mod->majorVer() == 3) ? 'b' : 0);
OutputString(obj.cast<PycString>(), mod->strIsUnicode() ? 'b' : 0);
break;
case PycObject::TYPE_UNICODE:
OutputString(obj.cast<PycString>(), (mod->majorVer() == 3) ? 0 : 'u');
OutputString(obj.cast<PycString>(), mod->strIsUnicode() ? 0 : 'u');
break;
case PycObject::TYPE_STRINGREF:
case PycObject::TYPE_INTERNED:
@@ -162,7 +162,10 @@ void print_const(PycRef<PycObject> obj, PycModule* mod)
case PycObject::TYPE_ASCII_INTERNED:
case PycObject::TYPE_SHORT_ASCII:
case PycObject::TYPE_SHORT_ASCII_INTERNED:
OutputString(obj.cast<PycString>(), 0);
if (mod->majorVer() >= 3)
OutputString(obj.cast<PycString>(), 0);
else
OutputString(obj.cast<PycString>(), mod->strIsUnicode() ? 'b' : 0);
break;
case PycObject::TYPE_TUPLE:
case PycObject::TYPE_SMALL_TUPLE: