From 15a3189568909de6473d52d1ac40e9bbffd626ea Mon Sep 17 00:00:00 2001
From: Alliumcepa <fffonion@gmail.com>
Date: Wed, 15 Nov 2017 17:17:36 -0500
Subject: [PATCH] fix global being overwritten #35, fix interactive when using
 py3k

---
 xeHentai/cli.py           | 2 +-
 xeHentai/util/__init__.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/xeHentai/cli.py b/xeHentai/cli.py
index 351b863..d17f196 100644
--- 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
index 3ff0178..dfd48f2 100644
--- 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':'®'}