Fix bug can not quote in Python 2, Fix #195

[rainbowstream.git] / setup.py

diff --git a/setup.py b/setup.py
index 99b932f9cbd67565e1e12dbc73494293e1c7ebed..2b7b15eb0b3431f01dc85a4a3b0ab40574a02bff 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,21 @@
 from setuptools import setup, find_packages
 import os
 import os.path
+import sys
+
+if sys.version[0] == "2":
+    from pipes import quote
+else:
+    from shlex import quote
 
 # Bumped version
-version = '1.2.7'
+version = '1.3.5'
 
 # Require
 install_requires = [
     "python-dateutil",
     "arrow",
-    "requests",
+    "requests==2.5.3",
     "pyfiglet",
     "twitter",
     "Pillow",
@@ -17,11 +23,17 @@ install_requires = [
     "pocket"
 ]
 
+# Default user (considers non virtualenv method)
+user = os.environ.get('SUDO_USER', os.environ.get('USER', None))
+
 # Copy default config if not exists
 default = os.path.expanduser("~") + os.sep + '.rainbow_config.json'
 if not os.path.isfile(default):
     cmd = 'cp rainbowstream/colorset/config ' + default
     os.system(cmd)
+    if user:
+        cmd = 'chown ' + quote(user) + ' ' + default
+        os.system(cmd)
     cmd = 'chmod 777 ' + default
     os.system(cmd)
 
@@ -40,6 +52,7 @@ setup(name='rainbowstream',
           "Programming Language :: Python :: 3.2",
           "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
+          "Programming Language :: Python :: 3.5",
           "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
           "Topic :: Utilities",
           "License :: OSI Approved :: MIT License",