From 8aff095fba12a5c7d89dc5890060fffa36a439a1 Mon Sep 17 00:00:00 2001
From: Jelly Choi <jelly@Jellys-MacBook-Pro.local>
Date: Tue, 5 Dec 2017 15:25:24 +0900
Subject: [PATCH] Fix valid module

---
 pingdumb/pingdumb.py => pingdumb.py | 51 ++++++++++++++---------------
 pingdumb/conf.py                    |  1 -
 pingdumb/main_module.py             |  2 +-
 setup.py                            |  8 +++--
 4 files changed, 31 insertions(+), 31 deletions(-)
 rename pingdumb/pingdumb.py => pingdumb.py (95%)

diff --git a/pingdumb/pingdumb.py b/pingdumb.py
similarity index 95%
rename from pingdumb/pingdumb.py
rename to pingdumb.py
index 27c3ef7..3da3d6b 100755
--- a/pingdumb/pingdumb.py
+++ b/pingdumb.py
@@ -1,26 +1,25 @@
-import sys
-
-from pingdumb.conf import read_config, set_config, \
-    write_config, extract_password_with_argv
-from pingdumb.main_module import checker
-from pingdumb.smtp_module import smtp_login_with_conf_test
-
-
-def main(argv):
-    
-    if len(sys.argv) == 1:
-        conf = set_config()
-        s_pw = conf["smtpPw"]
-        write_config(conf)
-    else:
-        """if exist argv, set password and execute with default configure"""
-        s_pw = extract_password_with_argv(argv)
-        conf = read_config()
-        
-    conf["smtpPw"] = s_pw
-    smtp_login_with_conf_test(conf)
-
-    checker(conf)
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
+import sys
+
+from pingdumb.conf import read_config, set_config, \
+    write_config, extract_password_with_argv
+from pingdumb.main_module import checker
+from pingdumb.smtp_module import smtp_login_with_conf_test
+
+
+def main(argv):
+    if len(sys.argv) == 1:
+        conf = set_config()
+        s_pw = conf["smtpPw"]
+        write_config(conf)
+    else:
+        """if exist argv, set password and execute with default configure"""
+        s_pw = extract_password_with_argv(argv)
+        conf = read_config()
+        
+    conf["smtpPw"] = s_pw
+    smtp_login_with_conf_test(conf)
+
+    checker(conf)
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
diff --git a/pingdumb/conf.py b/pingdumb/conf.py
index 4ad593d..13ae3d3 100644
--- a/pingdumb/conf.py
+++ b/pingdumb/conf.py
@@ -1,7 +1,6 @@
 import getpass
 import json
 import getopt
-from builtins import input
 from genericpath import isfile
 from os.path import sep
 
diff --git a/pingdumb/main_module.py b/pingdumb/main_module.py
index 8f121ea..f72e05a 100644
--- a/pingdumb/main_module.py
+++ b/pingdumb/main_module.py
@@ -1,6 +1,6 @@
 import datetime
 import time
-from future.moves.urllib.request import urlopen
+from urllib.request import urlopen
 
 
 from pingdumb.smtp_module import form_msg, send_status_mail
diff --git a/setup.py b/setup.py
index 2d49ff0..f949fae 100644
--- a/setup.py
+++ b/setup.py
@@ -4,12 +4,14 @@
 setup(
     name = 'pingdumb',
     packages = ['pingdumb'],
-    version = '0.1.4',
+    version = '0.1.5',
     description = 'Check http status on console',
     author = 'Hyeon-Mook Jerry Choi',
     author_email = 'chm073@gmail.com',
     url = 'https://github.com/kyunooh/pingdumb',
-    download_url = 'https://github.com/kyunooh/pingdumb/tarball/0.1.4',
-    keywords = ['testing', 'loggin', 'example'],
+    download_url = 'https://github.com/kyunooh/pingdumb/tarball/0.1.5',
+    keywords = ['testing', 'login', 'example'],
+    python_require = '>=3',
+    zip_safe = False,
     classifiers = []
 )