andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

distutils doesn't like unicode in its package lists

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-11-13 20:01:57 +01:00
parent dc356a81fd
commit e793be6e18
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup.py
View File

@ -66,18 +66,17 @@ for scheme in INSTALL_SCHEMES.values():
# an easy way to do this. # an easy way to do this.
packages, data_files = [], [] packages, data_files = [], []
root_dir = os.path.dirname(__file__) root_dir = os.path.dirname(__file__)
if root_dir != '': if root_dir != b'':
os.chdir(root_dir) os.chdir(root_dir)
project_dir = 'mopidy' project_dir = b'mopidy'
for dirpath, dirnames, filenames in os.walk(project_dir): for dirpath, dirnames, filenames in os.walk(project_dir):
# Ignore dirnames that start with '.' # Ignore dirnames that start with '.'
for i, dirname in enumerate(dirnames): for i, dirname in enumerate(dirnames):
if dirname.startswith('.'): if dirname.startswith(b'.'):
del dirnames[i] del dirnames[i]
if '__init__.py' in filenames: if b'__init__.py' in filenames:
packages.append('.'.join(fullsplit(dirpath))) packages.append(b'.'.join(fullsplit(dirpath)))
elif filenames: elif filenames:
data_files.append([ data_files.append([
dirpath, [os.path.join(dirpath, f) for f in filenames]]) dirpath, [os.path.join(dirpath, f) for f in filenames]])
@ -89,7 +88,7 @@ setup(
author='Stein Magnus Jodal', author='Stein Magnus Jodal',
author_email='stein.magnus@jodal.no', author_email='stein.magnus@jodal.no',
packages=packages, packages=packages,
package_data={'mopidy': ['backends/spotify/spotify_appkey.key']}, package_data={b'mopidy': ['backends/spotify/spotify_appkey.key']},
cmdclass=cmdclasses, cmdclass=cmdclasses,
data_files=data_files, data_files=data_files,
scripts=['bin/mopidy', 'bin/mopidy-scan'], scripts=['bin/mopidy', 'bin/mopidy-scan'],