From d5df4531433b2031186ed2a8b335892b3600912b Mon Sep 17 00:00:00 2001 From: "Guy Rozendorn (guyr@infinidat.com)" Date: Fri, 7 Oct 2011 19:08:55 +0200 Subject: Reverting 1a1ab844f03e due to issue 250 --HG-- branch : distribute extra : rebase_source : 0dca5e604c96429f07c4d7786d3a0991c42c129d --- setuptools/command/register.py | 60 ------------------------------------------ 1 file changed, 60 deletions(-) (limited to 'setuptools/command/register.py') diff --git a/setuptools/command/register.py b/setuptools/command/register.py index 874401a5..3b2e0859 100755 --- a/setuptools/command/register.py +++ b/setuptools/command/register.py @@ -1,6 +1,4 @@ from distutils.command.register import register as _register -from ConfigParser import ConfigParser -import os class register(_register): __doc__ = _register.__doc__ @@ -8,63 +6,5 @@ class register(_register): def run(self): # Make sure that we are using valid current name/version info self.run_command('egg_info') - self._section_name = self.repository _register.run(self) - def _read_pypirc(self): - """Reads the .pypirc file.""" - rc = self._get_rc_file() - if os.path.exists(rc): - repository = self.repository - config = ConfigParser() - config.read(rc) - sections = config.sections() - if 'distutils' in sections: - # let's get the list of servers - index_servers = config.get('distutils', 'index-servers') - _servers = [server.strip() for server in - index_servers.split('\n') - if server.strip() != ''] - if _servers == []: - # nothing set, let's try to get the default pypi - if 'pypi' in sections: - _servers = ['pypi'] - else: - # the file is not properly defined, returning - # an empty dict - return {} - for server in _servers: - current = {'server': server} - current['username'] = config.get(server, 'username') - - # optional params - for key, default in (('repository', - None), - ('realm', self.DEFAULT_REALM), - ('password', None)): - if config.has_option(server, key): - current[key] = config.get(server, key) - else: - current[key] = default - if (current['server'] == repository or - current['repository'] == repository): - return current - elif 'server-login' in sections: - # old format - server = 'server-login' - if config.has_option(server, 'repository'): - repository = config.get(server, 'repository') - else: - repository = None - return {'username': config.get(server, 'username'), - 'password': config.get(server, 'password'), - 'repository': repository, - 'server': server, - 'realm': self.DEFAULT_REALM} - - return {} - - def _set_config(self): - _register._set_config(self) - if self.repository is None: - raise ValueError('%s is missing a repository value in .pypirc' % self._section_name) -- cgit v1.2.3