- (reverted from commit f27e7f8)

cool-RR · cool-RR · commit 35355ec8fafb · 2013-09-18T21:37:27.000+03:00
diff --git a/setup.py b/setup.py
@@ -20,12 +20,10 @@
 #                                                                             #
 ### Finished confirming correct Python version. ###############################
 
-if 'sdist' in sys.argv:
-    source_folders = ('source_py2', 'source_py3')
-elif sys.version_info[0] == 3:
-    source_folders = ('source_py3',)
+if sys.version_info[0] == 3:
+    source_folder = '.source_py3'
 else:
-    source_folders = ('source_py2',)
+    source_folder = '.source_py2'
 
 
 def get_python_toolbox_packages():
@@ -39,7 +37,7 @@ def get_python_toolbox_packages():
         
     '''
     return ['python_toolbox.' + p for p in
-            setuptools.find_packages('%s/python_toolbox' % source_folder)] + \
+            setuptools.find_packages('./python_toolbox')] + \
            ['python_toolbox']
 
 
@@ -54,8 +52,7 @@ def get_test_python_toolbox_packages():
         
     '''
     return ['test_python_toolbox.' + p for p in
-            setuptools.find_packages('%s/test_python_toolbox' % source_folder
-                                                                         )] + \
+            setuptools.find_packages('./test_python_toolbox')] + \
            ['test_python_toolbox']
 
 
@@ -148,10 +145,9 @@ def get_packages():
     description='A collection of Python tools for various tasks',
     author='Ram Rachum',
     author_email='ram@rachum.com',
-    #package_dir={'': source_folder}, 
+    package_dir=source_folder, 
     packages=get_packages(),
-    scripts=['%s/test_python_toolbox/scripts/_test_python_toolbox.py'
-                                                              % source_folder],
+    scripts=['test_python_toolbox/scripts/_test_python_toolbox.py'],
     long_description=my_long_description,
     license='MIT',
     classifiers=my_classifiers,
