Mercurial > cpython-lru_cache-weakref
annotate Lib/distutils/command/register.py @ 27998:e27f58a50737 legacy-trunk
SF bug #690377: Dud footnote reference in distutils docs
| author | Raymond Hettinger <python@rcn.com> |
|---|---|
| date | Fri, 21 Feb 2003 02:47:09 +0000 |
| parents | d5ea2b67b5f4 |
| children | bda490fc2691 |
| rev | line source |
|---|---|
|
27049
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
1 """distutils.command.register |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
2 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
3 Implements the Distutils 'register' command (register with the repository). |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
4 """ |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
5 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
6 # created 2002/10/21, Richard Jones |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
7 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
8 __revision__ = "$Id$" |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
9 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
10 import sys, os, string, urllib2, getpass, urlparse |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
11 import StringIO, ConfigParser |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
12 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
13 from distutils.core import Command |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
14 from distutils.errors import * |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
15 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
16 class register(Command): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
17 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
18 description = "register the distribution with the repository" |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
19 |
|
27945
b5560ae4d971
Use python.org as the repository
Andrew M. Kuchling <amk@amk.ca>
parents:
27049
diff
changeset
|
20 DEFAULT_REPOSITORY = 'http://www.python.org/pypi' |
|
27049
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
21 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
22 user_options = [ |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
23 ('repository=', 'r', |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
24 "url of repository [default: %s]"%DEFAULT_REPOSITORY), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
25 ('verify', None, |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
26 'verify the package metadata for correctness'), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
27 ('list-classifiers', None, |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
28 'list the valid Trove classifiers'), |
|
27974
d0d29df2b639
[Patch #684398] Rename verbose argument to show-response; don't conditionalize the get_classifiers() call
Andrew M. Kuchling <amk@amk.ca>
parents:
27945
diff
changeset
|
29 ('show-response', None, |
|
d0d29df2b639
[Patch #684398] Rename verbose argument to show-response; don't conditionalize the get_classifiers() call
Andrew M. Kuchling <amk@amk.ca>
parents:
27945
diff
changeset
|
30 'display full response text from server'), |
|
27049
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
31 ] |
|
27974
d0d29df2b639
[Patch #684398] Rename verbose argument to show-response; don't conditionalize the get_classifiers() call
Andrew M. Kuchling <amk@amk.ca>
parents:
27945
diff
changeset
|
32 boolean_options = ['verify', 'show-response', 'list-classifiers'] |
|
27049
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
33 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
34 def initialize_options(self): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
35 self.repository = None |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
36 self.verify = 0 |
|
27974
d0d29df2b639
[Patch #684398] Rename verbose argument to show-response; don't conditionalize the get_classifiers() call
Andrew M. Kuchling <amk@amk.ca>
parents:
27945
diff
changeset
|
37 self.show_response = 0 |
|
27049
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
38 self.list_classifiers = 0 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
39 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
40 def finalize_options(self): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
41 if self.repository is None: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
42 self.repository = self.DEFAULT_REPOSITORY |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
43 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
44 def run(self): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
45 self.check_metadata() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
46 if self.verify: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
47 self.verify_metadata() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
48 elif self.list_classifiers: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
49 self.classifiers() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
50 else: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
51 self.send_metadata() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
52 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
53 def check_metadata(self): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
54 """Ensure that all required elements of meta-data (name, version, |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
55 URL, (author and author_email) or (maintainer and |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
56 maintainer_email)) are supplied by the Distribution object; warn if |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
57 any are missing. |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
58 """ |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
59 metadata = self.distribution.metadata |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
60 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
61 missing = [] |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
62 for attr in ('name', 'version', 'url'): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
63 if not (hasattr(metadata, attr) and getattr(metadata, attr)): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
64 missing.append(attr) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
65 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
66 if missing: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
67 self.warn("missing required meta-data: " + |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
68 string.join(missing, ", ")) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
69 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
70 if metadata.author: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
71 if not metadata.author_email: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
72 self.warn("missing meta-data: if 'author' supplied, " + |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
73 "'author_email' must be supplied too") |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
74 elif metadata.maintainer: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
75 if not metadata.maintainer_email: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
76 self.warn("missing meta-data: if 'maintainer' supplied, " + |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
77 "'maintainer_email' must be supplied too") |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
78 else: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
79 self.warn("missing meta-data: either (author and author_email) " + |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
80 "or (maintainer and maintainer_email) " + |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
81 "must be supplied") |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
82 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
83 def classifiers(self): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
84 ''' Fetch the list of classifiers from the server. |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
85 ''' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
86 response = urllib2.urlopen(self.repository+'?:action=list_classifiers') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
87 print response.read() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
88 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
89 def verify_metadata(self): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
90 ''' Send the metadata to the package index server to be checked. |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
91 ''' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
92 # send the info to the server and report the result |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
93 (code, result) = self.post_to_server(self.build_post_data('verify')) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
94 print 'Server response (%s): %s'%(code, result) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
95 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
96 def send_metadata(self): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
97 ''' Send the metadata to the package index server. |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
98 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
99 Well, do the following: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
100 1. figure who the user is, and then |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
101 2. send the data as a Basic auth'ed POST. |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
102 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
103 First we try to read the username/password from $HOME/.pypirc, |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
104 which is a ConfigParser-formatted file with a section |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
105 [server-login] containing username and password entries (both |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
106 in clear text). Eg: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
107 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
108 [server-login] |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
109 username: fred |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
110 password: sekrit |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
111 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
112 Otherwise, to figure who the user is, we offer the user three |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
113 choices: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
114 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
115 1. use existing login, |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
116 2. register as a new user, or |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
117 3. set the password to a random string and email the user. |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
118 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
119 ''' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
120 choice = 'x' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
121 username = password = '' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
122 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
123 # see if we can short-cut and get the username/password from the |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
124 # config |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
125 config = None |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
126 if os.environ.has_key('HOME'): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
127 rc = os.path.join(os.environ['HOME'], '.pypirc') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
128 if os.path.exists(rc): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
129 print 'Using PyPI login from %s'%rc |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
130 config = ConfigParser.ConfigParser() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
131 config.read(rc) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
132 username = config.get('server-login', 'username') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
133 password = config.get('server-login', 'password') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
134 choice = '1' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
135 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
136 # get the user's login info |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
137 choices = '1 2 3 4'.split() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
138 while choice not in choices: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
139 print '''We need to know who you are, so please choose either: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
140 1. use your existing login, |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
141 2. register as a new user, |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
142 3. have the server generate a new password for you (and email it to you), or |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
143 4. quit |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
144 Your selection [default 1]: ''', |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
145 choice = raw_input() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
146 if not choice: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
147 choice = '1' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
148 elif choice not in choices: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
149 print 'Please choose one of the four options!' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
150 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
151 if choice == '1': |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
152 # get the username and password |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
153 while not username: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
154 username = raw_input('Username: ') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
155 while not password: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
156 password = getpass.getpass('Password: ') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
157 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
158 # set up the authentication |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
159 auth = urllib2.HTTPPasswordMgr() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
160 host = urlparse.urlparse(self.repository)[1] |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
161 auth.add_password('pypi', host, username, password) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
162 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
163 # send the info to the server and report the result |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
164 code, result = self.post_to_server(self.build_post_data('submit'), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
165 auth) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
166 print 'Server response (%s): %s'%(code, result) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
167 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
168 # possibly save the login |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
169 if os.environ.has_key('HOME') and config is None and code == 200: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
170 rc = os.path.join(os.environ['HOME'], '.pypirc') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
171 print 'I can store your PyPI login so future submissions will be faster.' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
172 print '(the login will be stored in %s)'%rc |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
173 choice = 'X' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
174 while choice.lower() not in 'yn': |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
175 choice = raw_input('Save your login (y/N)?') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
176 if not choice: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
177 choice = 'n' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
178 if choice.lower() == 'y': |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
179 f = open(rc, 'w') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
180 f.write('[server-login]\nusername:%s\npassword:%s\n'%( |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
181 username, password)) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
182 f.close() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
183 try: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
184 os.chmod(rc, 0600) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
185 except: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
186 pass |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
187 elif choice == '2': |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
188 data = {':action': 'user'} |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
189 data['name'] = data['password'] = data['email'] = '' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
190 data['confirm'] = None |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
191 while not data['name']: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
192 data['name'] = raw_input('Username: ') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
193 while data['password'] != data['confirm']: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
194 while not data['password']: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
195 data['password'] = getpass.getpass('Password: ') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
196 while not data['confirm']: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
197 data['confirm'] = getpass.getpass(' Confirm: ') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
198 if data['password'] != data['confirm']: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
199 data['password'] = '' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
200 data['confirm'] = None |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
201 print "Password and confirm don't match!" |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
202 while not data['email']: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
203 data['email'] = raw_input(' EMail: ') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
204 code, result = self.post_to_server(data) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
205 if code != 200: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
206 print 'Server response (%s): %s'%(code, result) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
207 else: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
208 print 'You will receive an email shortly.' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
209 print 'Follow the instructions in it to complete registration.' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
210 elif choice == '3': |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
211 data = {':action': 'password_reset'} |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
212 data['email'] = '' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
213 while not data['email']: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
214 data['email'] = raw_input('Your email address: ') |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
215 code, result = self.post_to_server(data) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
216 print 'Server response (%s): %s'%(code, result) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
217 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
218 def build_post_data(self, action): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
219 # figure the data to send - the metadata plus some additional |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
220 # information used by the package server |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
221 meta = self.distribution.metadata |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
222 data = { |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
223 ':action': action, |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
224 'metadata_version' : '1.0', |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
225 'name': meta.get_name(), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
226 'version': meta.get_version(), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
227 'summary': meta.get_description(), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
228 'home_page': meta.get_url(), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
229 'author': meta.get_contact(), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
230 'author_email': meta.get_contact_email(), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
231 'license': meta.get_licence(), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
232 'description': meta.get_long_description(), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
233 'keywords': meta.get_keywords(), |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
234 'platform': meta.get_platforms(), |
|
27974
d0d29df2b639
[Patch #684398] Rename verbose argument to show-response; don't conditionalize the get_classifiers() call
Andrew M. Kuchling <amk@amk.ca>
parents:
27945
diff
changeset
|
235 'classifiers': meta.get_classifiers(), |
|
27976
d5ea2b67b5f4
Include download_url in the data POSTed to the catalog server
Andrew M. Kuchling <amk@amk.ca>
parents:
27974
diff
changeset
|
236 'download_url': meta.get_download_url(), |
|
27049
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
237 } |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
238 return data |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
239 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
240 def post_to_server(self, data, auth=None): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
241 ''' Post a query to the server, and return a string response. |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
242 ''' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
243 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
244 # Build up the MIME payload for the urllib2 POST data |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
245 boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
246 sep_boundary = '\n--' + boundary |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
247 end_boundary = sep_boundary + '--' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
248 body = StringIO.StringIO() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
249 for key, value in data.items(): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
250 # handle multiple entries for the same name |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
251 if type(value) != type([]): |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
252 value = [value] |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
253 for value in value: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
254 value = str(value) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
255 body.write(sep_boundary) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
256 body.write('\nContent-Disposition: form-data; name="%s"'%key) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
257 body.write("\n\n") |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
258 body.write(value) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
259 if value and value[-1] == '\r': |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
260 body.write('\n') # write an extra newline (lurve Macs) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
261 body.write(end_boundary) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
262 body.write("\n") |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
263 body = body.getvalue() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
264 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
265 # build the Request |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
266 headers = { |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
267 'Content-type': 'multipart/form-data; boundary=%s'%boundary, |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
268 'Content-length': str(len(body)) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
269 } |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
270 req = urllib2.Request(self.repository, body, headers) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
271 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
272 # handle HTTP and include the Basic Auth handler |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
273 opener = urllib2.build_opener( |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
274 urllib2.HTTPBasicAuthHandler(password_mgr=auth) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
275 ) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
276 data = '' |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
277 try: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
278 result = opener.open(req) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
279 except urllib2.HTTPError, e: |
|
27974
d0d29df2b639
[Patch #684398] Rename verbose argument to show-response; don't conditionalize the get_classifiers() call
Andrew M. Kuchling <amk@amk.ca>
parents:
27945
diff
changeset
|
280 if self.show_response: |
|
27049
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
281 data = e.fp.read() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
282 result = e.code, e.msg |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
283 except urllib2.URLError, e: |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
284 result = 500, str(e) |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
285 else: |
|
27974
d0d29df2b639
[Patch #684398] Rename verbose argument to show-response; don't conditionalize the get_classifiers() call
Andrew M. Kuchling <amk@amk.ca>
parents:
27945
diff
changeset
|
286 if self.show_response: |
|
27049
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
287 data = result.read() |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
288 result = 200, 'OK' |
|
27974
d0d29df2b639
[Patch #684398] Rename verbose argument to show-response; don't conditionalize the get_classifiers() call
Andrew M. Kuchling <amk@amk.ca>
parents:
27945
diff
changeset
|
289 if self.show_response: |
|
27049
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
290 print '-'*75, data, '-'*75 |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
291 return result |
|
1cd9c8564875
[Patch #658094 ] PEP 301 implementation
Andrew M. Kuchling <amk@amk.ca>
parents:
diff
changeset
|
292 |
