setup.py: code cleaning (moved .ico files to a dedicaded folder in 'spyderlib')

Also fixing this error when building Spyder on Py3:
SyntaxError: invalid or missing encoding declaration for 'scripts\\spyder.ico'

Author: PierreRaybaut

scripts/spyder_win_post_install.py

@@ -22,18 +22,21 @@ def install():
     python = osp.join(sys.prefix, 'python.exe')
     script = osp.join(sys.prefix, 'scripts', 'spyder')
     workdir = "%HOMEDRIVE%%HOMEPATH%"
+    import distutils.sysconfig
+    lib_dir = distutils.sysconfig.get_python_lib(plat_specific=1)
+    ico_dir = osp.join(lib_dir, 'spyderlib', 'windows')
 
     desc = 'Scientific Python Development EnvironmEnt, an alternative to IDLE'
     fname = osp.join(start_menu, 'Spyder (full).lnk')
-    iconpath = osp.join(sys.prefix, 'scripts', 'spyder.ico')
-    create_shortcut(python, desc, fname, '"%s"' % script, workdir, iconpath)
+    create_shortcut(python, desc, fname, '"%s"' % script, workdir,
+                    osp.join(ico_dir, 'spyder.ico'))
     file_created(fname)
 
     desc += '. Light configuration: console and variable explorer only.'
     fname = osp.join(start_menu, 'Spyder (light).lnk')
-    iconpath = osp.join(sys.prefix, 'scripts', 'spyder_light.ico')
     create_shortcut(python, desc, fname,
-                    '"%s" --light' % script, workdir, iconpath)
+                    '"%s" --light' % script, workdir,
+                    osp.join(ico_dir, 'spyder_light.ico'))
     file_created(fname)
 
     fname = osp.join(start_menu, 'Spyder-Reset all settings.lnk')

setup.py

@@ -85,13 +85,14 @@ def get_packages():
             if osp.isdir(name):
                 packages += get_subpackages(name)
     return packages
-    
 
 # Note: the '[...]_win_post_install.py' script is installed even on non-Windows
 # platforms due to a bug in pip installation process (see Issue 1158)
 SCRIPTS = ['spyder', '%s_win_post_install.py' % NAME]
+EXTLIST = ['.mo', '.svg', '.png', '.css', '.html', '.js']
 if os.name == 'nt':
-    SCRIPTS += ['spyder.bat', 'spyder.ico', 'spyder_light.ico']
+    SCRIPTS += ['spyder.bat']
+    EXTLIST += ['.ico']
 
 # Adding a message for the bdist_wininst installer
 WININST_MSG = ""
@@ -118,12 +119,9 @@ def get_packages():
       keywords='PyQt4 PySide editor shell console widgets IDE',
       platforms=['any'],
       packages=get_packages(),
-      package_data={LIBNAME:
-                    get_package_data(LIBNAME, ('.mo', '.svg', '.png', '.css',
-                                               '.html', '.js')),
+      package_data={LIBNAME: get_package_data(LIBNAME, EXTLIST),
                     'spyderplugins':
-                    get_package_data('spyderplugins',
-                                     ('.mo', '.svg', '.png'))},
+                    get_package_data('spyderplugins', EXTLIST)},
       requires=["rope (>=0.9.2)", "sphinx (>=0.6.0)", "PyQt4 (>=4.4)"],
       scripts=[osp.join('scripts', fname) for fname in SCRIPTS],
       options={"bdist_wininst":