2008-05-15 04:14:05 +02:00
|
|
|
"""distutils.pypirc
|
|
|
|
|
|
|
|
Provides the PyPIRCCommand class, the base class for the command classes
|
|
|
|
that uses .pypirc in the distutils.command package.
|
|
|
|
"""
|
|
|
|
import os
|
|
|
|
from configparser import ConfigParser
|
|
|
|
|
Merged revisions 63208-63209,63211-63212,63214-63217,63219-63224,63226-63227,63229-63232,63234-63235,63237-63239,63241,63243-63246,63250-63254,63256-63259,63261,63263-63264,63266-63267,63269-63270,63272-63273,63275-63276,63278,63280-63281,63283-63284,63286-63287,63289-63290,63292-63293,63295-63296,63298-63299,63301-63302,63304-63305,63307,63309-63314,63316-63322,63324-63325,63327-63335,63337-63338,63340-63342,63344-63346,63348 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63208 | georg.brandl | 2008-05-13 15:04:54 -0400 (Tue, 13 May 2008) | 2 lines
#2831: add start argument to enumerate(). Patch by Scott Dial and me.
........
r63209 | marc-andre.lemburg | 2008-05-13 15:10:45 -0400 (Tue, 13 May 2008) | 3 lines
Remove leftovers from reverted setuptools checkin (they were added in r45525).
........
r63211 | georg.brandl | 2008-05-13 17:32:03 -0400 (Tue, 13 May 2008) | 2 lines
Fix a refleak in the _warnings module.
........
r63212 | andrew.kuchling | 2008-05-13 20:46:41 -0400 (Tue, 13 May 2008) | 1 line
List all the removes and renamed modules
........
r63214 | brett.cannon | 2008-05-13 21:09:40 -0400 (Tue, 13 May 2008) | 2 lines
Rewrap some lines in test_py3kwarn.
........
r63219 | georg.brandl | 2008-05-14 02:34:15 -0400 (Wed, 14 May 2008) | 2 lines
Add NEWS entry for #2831.
........
r63220 | neal.norwitz | 2008-05-14 02:47:56 -0400 (Wed, 14 May 2008) | 3 lines
Fix "refleak" by restoring the tearDown method removed by accident (AFAICT)
in r62788.
........
r63221 | georg.brandl | 2008-05-14 03:18:22 -0400 (Wed, 14 May 2008) | 2 lines
Fix another "refleak" by clearing the filters after test.
........
r63222 | neal.norwitz | 2008-05-14 03:21:42 -0400 (Wed, 14 May 2008) | 5 lines
Install the json package and tests as well as the lib2to3 tests
so the tests work when run from an install directory.
They are currently skipped on the daily runs (not from the buildbots)
for checking refleaks, etc.
........
r63256 | andrew.kuchling | 2008-05-14 21:10:24 -0400 (Wed, 14 May 2008) | 1 line
Note some removals and a rename
........
r63311 | brett.cannon | 2008-05-15 00:36:53 -0400 (Thu, 15 May 2008) | 2 lines
Add a snippet for the deprecation directive for docs.
........
r63313 | gregory.p.smith | 2008-05-15 00:56:18 -0400 (Thu, 15 May 2008) | 5 lines
disable the crashing test. I will also file a bug. This crash does
not appear to be a new bug, its just that the test coverage went up
recently exposing it. (I verified that by testing this test code on
an older Modules/_bsddb.c)
........
r63320 | georg.brandl | 2008-05-15 11:08:32 -0400 (Thu, 15 May 2008) | 2 lines
#2863: add gen.__name__ and add this name to generator repr().
........
r63324 | andrew.kuchling | 2008-05-15 16:07:39 -0400 (Thu, 15 May 2008) | 1 line
Import class from distutils.cmd, not .core, to avoid circular import
........
r63327 | alexandre.vassalotti | 2008-05-15 16:31:42 -0400 (Thu, 15 May 2008) | 2 lines
Fixed typo in a doctest of test_genexps.
........
r63332 | benjamin.peterson | 2008-05-15 18:34:33 -0400 (Thu, 15 May 2008) | 2 lines
add Mac modules to the list of deprecated ones
........
r63333 | benjamin.peterson | 2008-05-15 18:41:16 -0400 (Thu, 15 May 2008) | 2 lines
fix typos in whatsnew
........
r63348 | benjamin.peterson | 2008-05-15 22:24:49 -0400 (Thu, 15 May 2008) | 2 lines
make test_platform a bit more assertive (We'll see what the buildbots say.)
........
2008-05-16 06:39:54 +02:00
|
|
|
from distutils.cmd import Command
|
2008-05-15 04:14:05 +02:00
|
|
|
|
|
|
|
DEFAULT_PYPIRC = """\
|
Merged revisions 67889-67892,67895,67898,67904-67907,67912,67918,67920-67921,67923-67924,67926-67927,67930,67943 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67889 | benjamin.peterson | 2008-12-20 19:04:32 -0600 (Sat, 20 Dec 2008) | 1 line
sphinx.web is long gone
................
r67890 | benjamin.peterson | 2008-12-20 19:12:26 -0600 (Sat, 20 Dec 2008) | 1 line
update readme
................
r67891 | benjamin.peterson | 2008-12-20 19:14:47 -0600 (Sat, 20 Dec 2008) | 1 line
there are way too many places which need to have the current version added
................
r67892 | benjamin.peterson | 2008-12-20 19:29:32 -0600 (Sat, 20 Dec 2008) | 9 lines
Merged revisions 67809 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67809 | benjamin.peterson | 2008-12-15 21:54:45 -0600 (Mon, 15 Dec 2008) | 1 line
fix logic error
........
................
r67895 | neal.norwitz | 2008-12-21 08:28:32 -0600 (Sun, 21 Dec 2008) | 2 lines
Add Tarek for work on distutils.
................
r67898 | benjamin.peterson | 2008-12-21 15:00:53 -0600 (Sun, 21 Dec 2008) | 1 line
compute DISTVERSION with patchlevel.py
................
r67904 | benjamin.peterson | 2008-12-22 14:44:58 -0600 (Mon, 22 Dec 2008) | 1 line
less attitude
................
r67905 | benjamin.peterson | 2008-12-22 14:51:15 -0600 (Mon, 22 Dec 2008) | 1 line
fix #4720: the format to PyArg_ParseTupleAndKeywords can now start with '|'
................
r67906 | benjamin.peterson | 2008-12-22 14:52:53 -0600 (Mon, 22 Dec 2008) | 1 line
add NEWS note
................
r67907 | benjamin.peterson | 2008-12-22 16:12:19 -0600 (Mon, 22 Dec 2008) | 1 line
silence compiler warning
................
r67912 | georg.brandl | 2008-12-23 06:37:21 -0600 (Tue, 23 Dec 2008) | 2 lines
Fix missing "svn" command.
................
r67918 | georg.brandl | 2008-12-23 09:44:25 -0600 (Tue, 23 Dec 2008) | 2 lines
Markup fix.
................
r67920 | benjamin.peterson | 2008-12-23 14:09:28 -0600 (Tue, 23 Dec 2008) | 1 line
use a global variable, so the compiler doesn't optimize the assignment out
................
r67921 | benjamin.peterson | 2008-12-23 14:12:33 -0600 (Tue, 23 Dec 2008) | 1 line
make global static
................
r67923 | benjamin.peterson | 2008-12-24 09:10:27 -0600 (Wed, 24 Dec 2008) | 1 line
#4736 BufferRWPair.closed shouldn't try to call another property as a function
................
r67924 | benjamin.peterson | 2008-12-24 10:10:05 -0600 (Wed, 24 Dec 2008) | 1 line
pretend exceptions don't exist a while longer
................
r67926 | tarek.ziade | 2008-12-24 13:10:05 -0600 (Wed, 24 Dec 2008) | 1 line
fixed #4400 : distutils .pypirc default generated file was broken.
................
r67927 | benjamin.peterson | 2008-12-26 17:26:30 -0600 (Fri, 26 Dec 2008) | 1 line
python version is included in file name now
................
r67930 | hirokazu.yamamoto | 2008-12-26 22:19:48 -0600 (Fri, 26 Dec 2008) | 2 lines
Issue #4740: Use HIGHEST_PROTOCOL in pickle test.
(There is no behavior difference in 2.x because HIGHEST_PROTOCOL == 2)
................
r67943 | alexandre.vassalotti | 2008-12-27 04:02:59 -0600 (Sat, 27 Dec 2008) | 2 lines
Fix bogus unicode tests in pickletester.
................
2008-12-27 17:00:54 +01:00
|
|
|
[distutils]
|
|
|
|
index-servers =
|
2008-05-15 04:14:05 +02:00
|
|
|
pypi
|
|
|
|
|
|
|
|
[pypi]
|
|
|
|
username:%s
|
|
|
|
password:%s
|
|
|
|
"""
|
|
|
|
|
|
|
|
class PyPIRCCommand(Command):
|
|
|
|
"""Base command that knows how to handle the .pypirc file
|
|
|
|
"""
|
|
|
|
DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
|
|
|
|
DEFAULT_REALM = 'pypi'
|
|
|
|
repository = None
|
|
|
|
realm = None
|
|
|
|
|
|
|
|
user_options = [
|
|
|
|
('repository=', 'r',
|
|
|
|
"url of repository [default: %s]" % \
|
|
|
|
DEFAULT_REPOSITORY),
|
|
|
|
('show-response', None,
|
|
|
|
'display full response text from server')]
|
|
|
|
|
|
|
|
boolean_options = ['show-response']
|
|
|
|
|
|
|
|
def _get_rc_file(self):
|
|
|
|
"""Returns rc file path."""
|
|
|
|
return os.path.join(os.path.expanduser('~'), '.pypirc')
|
|
|
|
|
|
|
|
def _store_pypirc(self, username, password):
|
|
|
|
"""Creates a default .pypirc file."""
|
|
|
|
rc = self._get_rc_file()
|
|
|
|
f = open(rc, 'w')
|
|
|
|
try:
|
|
|
|
f.write(DEFAULT_PYPIRC % (username, password))
|
|
|
|
finally:
|
|
|
|
f.close()
|
|
|
|
try:
|
Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines
#1858 from Tarek Ziade:
Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
for discussion.
The patch is slightly revised from Tarek's last patch: I've simplified
the PyPIRCCommand.finalize_options() method to not look at sys.argv.
Tests still pass.
........
r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines
Cleaned up io._BytesIO.write().
I am amazed that the old code, for inserting null-bytes, actually
worked. Who wrote that thing? Oh, it is me... doh.
........
r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines
Revert r62998 as it broke the build (seems distutils.config is missing).
........
r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line
#1858: add distutils.config module
........
r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines
Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines
Copied two versions of the example from the interactive session. Delete
one.
........
r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines
reload() takes the module itself.
........
r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines
Added test framework for handling module renames.
Factored the import guard in test_py3kwarn.TestStdlibRemovals into
a context manager, namely test_support.CleanImport.
........
r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines
#2742: ``''`` is not converted to NULL in getaddrinfo.
........
r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines
Fixed typo in a comment of test_support.CleanImport.
........
r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines
Removed a dead line of code.
........
r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines
#2812: document property.getter/setter/deleter.
........
r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines
#1153769: document PEP 237 changes to string formatting.
........
r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines
#2809: elaborate str.split docstring a bit.
........
r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines
Fix typo.
........
r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines
#2709: clarification.
........
r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines
#2659: add ``break_on_hyphens`` to TextWrapper.
........
r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines
#2741: clarification of value range for address_family.
........
r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines
#2452: timeout is used for all blocking operations.
........
r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines
#1792: Improve performance of marshal.dumps() on large objects by increasing
the size of the buffer more quickly.
........
r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line
#1858: re-apply patch for this, adding the missing files
........
r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines
Add the "until" command to pdb
........
r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines
Add some sentence endings.
........
2008-05-16 02:03:33 +02:00
|
|
|
os.chmod(rc, 0o600)
|
2008-05-15 04:14:05 +02:00
|
|
|
except OSError:
|
|
|
|
# should do something better here
|
|
|
|
pass
|
|
|
|
|
|
|
|
def _read_pypirc(self):
|
|
|
|
"""Reads the .pypirc file."""
|
|
|
|
rc = self._get_rc_file()
|
|
|
|
if os.path.exists(rc):
|
2008-05-26 19:01:57 +02:00
|
|
|
self.announce('Using PyPI login from %s' % rc)
|
2008-05-15 04:14:05 +02:00
|
|
|
repository = self.repository or self.DEFAULT_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',
|
|
|
|
self.DEFAULT_REPOSITORY),
|
2009-01-09 01:15:45 +01:00
|
|
|
('realm', self.DEFAULT_REALM),
|
|
|
|
('password', None)):
|
2008-05-15 04:14:05 +02:00
|
|
|
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 = self.DEFAULT_REPOSITORY
|
|
|
|
return {'username': config.get(server, 'username'),
|
|
|
|
'password': config.get(server, 'password'),
|
|
|
|
'repository': repository,
|
|
|
|
'server': server,
|
|
|
|
'realm': self.DEFAULT_REALM}
|
|
|
|
|
|
|
|
return {}
|
|
|
|
|
|
|
|
def initialize_options(self):
|
|
|
|
"""Initialize options."""
|
|
|
|
self.repository = None
|
|
|
|
self.realm = None
|
|
|
|
self.show_response = 0
|
|
|
|
|
|
|
|
def finalize_options(self):
|
|
|
|
"""Finalizes options."""
|
|
|
|
if self.repository is None:
|
|
|
|
self.repository = self.DEFAULT_REPOSITORY
|
|
|
|
if self.realm is None:
|
|
|
|
self.realm = self.DEFAULT_REALM
|