fix global being overwritten #35, fix interactive when using py3k

fffonion · Jan 4, 2018 · 15a3189 · 15a3189
1 parent 1998809
commit 15a3189
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/xeHentai/cli.py b/xeHentai/cli.py
@@ -197,7 +197,7 @@ def _readline(x, default = ""):
             x = x % default
         _ = input(logger.safestr(x)) if PY3K else raw_input(logger.safestr(x))
         _ = _ or default
-        return _.decode(locale.getdefaultlocale()[1] or 'utf-8')
+        return _ if PY3K else _.decode(locale.getdefaultlocale()[1] or 'utf-8')
 
     if not xeH.has_login and _readline(i18n.PS_LOGIN) == 'y':
         uname = pwd = ""

diff --git a/xeHentai/util/__init__.py b/xeHentai/util/__init__.py
@@ -16,6 +16,9 @@
 else:# assume posix
     filename_filter = re.compile("[\/:]")
 
+if PY3K:
+    unichr = chr
+
 def parse_cookie(coostr):
     ret = {}
     for coo in coostr.split(";"):
@@ -63,8 +66,6 @@ def parse_human_time(s):
     return rt
 
 def htmlescape(s):
-    if PY3K:
-        unichr = chr
     def replc(match):
         #print match.group(0),match.group(1),match.group(2)
         dict={'amp':'&','nbsp':' ','quot':'"','lt':'<','gt':'>','copy':'©','reg':'®'}