[tor-commits] [bridgedb/master] Remove installData class and all distutils references from setup.py.

isis at torproject.org isis at torproject.org
Sun Jan 12 06:06:30 UTC 2014


commit f2c6205207178e2814213c067d346ab21226d05f
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Oct 15 04:58:28 2013 +0000

    Remove installData class and all distutils references from setup.py.
    
     * FIXES all the distutils hellspawn bugs arising from the disturbed grave of
       distribute. Everything is purely setuptools now.
---
 setup.py |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/setup.py b/setup.py
index e710fe5..c7bb271 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,6 @@
 
 from __future__ import print_function
 
-from distutils.command.install_data import install_data as _install_data
 import os
 import setuptools
 import sys
@@ -88,7 +87,7 @@ def get_cmdclass():
               'extract_messages': extract_messages,
               'init_catalog': init_catalog,
               'update_catalog': update_catalog,
-              'install_data': installData}
+             }
     cmdclass.update(versioneer.get_cmdclass())
     return cmdclass
 
@@ -220,18 +219,6 @@ def get_data_files(filesonly=False):
     return data_files
 
 
-class installData(_install_data):
-    def run(self):
-        self.data_files = get_data_files()
-        for lang in os.listdir('build/locale/'):
-            if lang.endswith('templates'):
-                continue
-            lang_dir = os.path.join('share', 'locale', lang, 'LC_MESSAGES')
-            lang_file = os.path.join('build', 'locale', lang, 'LC_MESSAGES', 
-                                     'bridgedb.mo')
-            self.data_files.append( (lang_dir, [lang_file]) )
-        _install_data.run(self)
-
 class runTests(setuptools.Command):
     # Based on setup.py from mixminion, which is based on setup.py
     # from Zooko's pyutil package, which is in turn based on





More information about the tor-commits mailing list