Ticket #1405: tolerate-exceptions-in-help-commands.darcs.patch

File tolerate-exceptions-in-help-commands.darcs.patch, 10.7 KB (added by davidsarah, at 2011-05-16T19:05:16Z)

embedded zetuptoolz: tolerate exceptions when loading extra commands for "setup.py --help-commands".

Line 
11 patch for repository davidsarah@dev.allmydata.org:/home/darcs/tahoe/trunk:
2
3Mon May 16 20:02:45 BST 2011  david-sarah@jacaranda.org
4  * embedded zetuptoolz: tolerate exceptions when loading extra commands for "setup.py --help-commands".
5
6New patches:
7
8[embedded zetuptoolz: tolerate exceptions when loading extra commands for "setup.py --help-commands".
9david-sarah@jacaranda.org**20110516190245
10 Ignore-this: 51bac9a9d94b397395f3b7bf52bb93c
11] hunk ./setuptools-0.6c16dev3.egg/setuptools/dist.py 403
12     def print_commands(self):
13         for ep in pkg_resources.iter_entry_points('distutils.commands'):
14             if ep.name not in self.cmdclass:
15-                cmdclass = ep.load(False) # don't require extras, we're not running
16-                self.cmdclass[ep.name] = cmdclass
17+                try:
18+                    cmdclass = ep.load(False) # don't require extras, we're not running
19+                    self.cmdclass[ep.name] = cmdclass
20+                except Exception:
21+                    pass
22         return _Distribution.print_commands(self)
23 
24 
25
26Context:
27
28[docs: remove out-of-date docs/testgrid/introducer.furl and containing directory. fixes #1404
29david-sarah@jacaranda.org**20110512140559
30 Ignore-this: 784548fc5367fac5450df1c46890876d
31]
32[scripts/common.py: don't assume that the default alias is always 'tahoe' (it is, but the API of get_alias doesn't say so). refs #1342
33david-sarah@jacaranda.org**20110130164923
34 Ignore-this: a271e77ce81d84bb4c43645b891d92eb
35]
36[setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError
37zooko@zooko.com**20110128142006
38 Ignore-this: 57d4bc9298b711e4bc9dc832c75295de
39 I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement().
40]
41[M-x whitespace-cleanup
42zooko@zooko.com**20110510193653
43 Ignore-this: dea02f831298c0f65ad096960e7df5c7
44]
45[docs: fix typo in running.rst, thanks to arch_o_median
46zooko@zooko.com**20110510193633
47 Ignore-this: ca06de166a46abbc61140513918e79e8
48]
49[relnotes.txt: don't claim to work on Cygwin (which has been untested for some time). refs #1342
50david-sarah@jacaranda.org**20110204204902
51 Ignore-this: 85ef118a48453d93fa4cddc32d65b25b
52]
53[relnotes.txt: forseeable -> foreseeable. refs #1342
54david-sarah@jacaranda.org**20110204204116
55 Ignore-this: 746debc4d82f4031ebf75ab4031b3a9
56]
57[replace remaining .html docs with .rst docs
58zooko@zooko.com**20110510191650
59 Ignore-this: d557d960a986d4ac8216d1677d236399
60 Remove install.html (long since deprecated).
61 Also replace some obsolete references to install.html with references to quickstart.rst.
62 Fix some broken internal references within docs/historical/historical_known_issues.txt.
63 Thanks to Ravi Pinjala and Patrick McDonald.
64 refs #1227
65]
66[docs: FTP-and-SFTP.rst: fix a minor error and update the information about which version of Twisted fixes #1297
67zooko@zooko.com**20110428055232
68 Ignore-this: b63cfb4ebdbe32fb3b5f885255db4d39
69]
70[munin tahoe_files plugin: fix incorrect file count
71francois@ctrlaltdel.ch**20110428055312
72 Ignore-this: 334ba49a0bbd93b4a7b06a25697aba34
73 fixes #1391
74]
75[Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions being stringified differently than in later versions of Python. refs #1389
76david-sarah@jacaranda.org**20110411190738
77 Ignore-this: 7847d26bc117c328c679f08a7baee519
78]
79[tests: add test for including the ImportError message and traceback entry in the summary of errors from importing dependencies. refs #1389
80david-sarah@jacaranda.org**20110410155844
81 Ignore-this: fbecdbeb0d06a0f875fe8d4030aabafa
82]
83[allmydata/__init__.py: preserve the message and last traceback entry (file, line number, function, and source line) of ImportErrors in the package versions string. fixes #1389
84david-sarah@jacaranda.org**20110410155705
85 Ignore-this: 2f87b8b327906cf8bfca9440a0904900
86]
87[remove unused variable detected by pyflakes
88zooko@zooko.com**20110407172231
89 Ignore-this: 7344652d5e0720af822070d91f03daf9
90]
91[allmydata/__init__.py: Nicer reporting of unparseable version numbers in dependencies. fixes #1388
92david-sarah@jacaranda.org**20110401202750
93 Ignore-this: 9c6bd599259d2405e1caadbb3e0d8c7f
94]
95[update FTP-and-SFTP.rst: the necessary patch is included in Twisted-10.1
96Brian Warner <warner@lothar.com>**20110325232511
97 Ignore-this: d5307faa6900f143193bfbe14e0f01a
98]
99[control.py: remove all uses of s.get_serverid()
100warner@lothar.com**20110227011203
101 Ignore-this: f80a787953bd7fa3d40e828bde00e855
102]
103[web: remove some uses of s.get_serverid(), not all
104warner@lothar.com**20110227011159
105 Ignore-this: a9347d9cf6436537a47edc6efde9f8be
106]
107[immutable/downloader/fetcher.py: remove all get_serverid() calls
108warner@lothar.com**20110227011156
109 Ignore-this: fb5ef018ade1749348b546ec24f7f09a
110]
111[immutable/downloader/fetcher.py: fix diversity bug in server-response handling
112warner@lothar.com**20110227011153
113 Ignore-this: bcd62232c9159371ae8a16ff63d22c1b
114 
115 When blocks terminate (either COMPLETE or CORRUPT/DEAD/BADSEGNUM), the
116 _shares_from_server dict was being popped incorrectly (using shnum as the
117 index instead of serverid). I'm still thinking through the consequences of
118 this bug. It was probably benign and really hard to detect. I think it would
119 cause us to incorrectly believe that we're pulling too many shares from a
120 server, and thus prefer a different server rather than asking for a second
121 share from the first server. The diversity code is intended to spread out the
122 number of shares simultaneously being requested from each server, but with
123 this bug, it might be spreading out the total number of shares requested at
124 all, not just simultaneously. (note that SegmentFetcher is scoped to a single
125 segment, so the effect doesn't last very long).
126]
127[immutable/downloader/share.py: reduce get_serverid(), one left, update ext deps
128warner@lothar.com**20110227011150
129 Ignore-this: d8d56dd8e7b280792b40105e13664554
130 
131 test_download.py: create+check MyShare instances better, make sure they share
132 Server objects, now that finder.py cares
133]
134[immutable/downloader/finder.py: reduce use of get_serverid(), one left
135warner@lothar.com**20110227011146
136 Ignore-this: 5785be173b491ae8a78faf5142892020
137]
138[immutable/offloaded.py: reduce use of get_serverid() a bit more
139warner@lothar.com**20110227011142
140 Ignore-this: b48acc1b2ae1b311da7f3ba4ffba38f
141]
142[immutable/upload.py: reduce use of get_serverid()
143warner@lothar.com**20110227011138
144 Ignore-this: ffdd7ff32bca890782119a6e9f1495f6
145]
146[immutable/checker.py: remove some uses of s.get_serverid(), not all
147warner@lothar.com**20110227011134
148 Ignore-this: e480a37efa9e94e8016d826c492f626e
149]
150[add remaining get_* methods to storage_client.Server, NoNetworkServer, and
151warner@lothar.com**20110227011132
152 Ignore-this: 6078279ddf42b179996a4b53bee8c421
153 MockIServer stubs
154]
155[upload.py: rearrange _make_trackers a bit, no behavior changes
156warner@lothar.com**20110227011128
157 Ignore-this: 296d4819e2af452b107177aef6ebb40f
158]
159[happinessutil.py: finally rename merge_peers to merge_servers
160warner@lothar.com**20110227011124
161 Ignore-this: c8cd381fea1dd888899cb71e4f86de6e
162]
163[test_upload.py: factor out FakeServerTracker
164warner@lothar.com**20110227011120
165 Ignore-this: 6c182cba90e908221099472cc159325b
166]
167[test_upload.py: server-vs-tracker cleanup
168warner@lothar.com**20110227011115
169 Ignore-this: 2915133be1a3ba456e8603885437e03
170]
171[happinessutil.py: server-vs-tracker cleanup
172warner@lothar.com**20110227011111
173 Ignore-this: b856c84033562d7d718cae7cb01085a9
174]
175[upload.py: more tracker-vs-server cleanup
176warner@lothar.com**20110227011107
177 Ignore-this: bb75ed2afef55e47c085b35def2de315
178]
179[upload.py: fix var names to avoid confusion between 'trackers' and 'servers'
180warner@lothar.com**20110227011103
181 Ignore-this: 5d5e3415b7d2732d92f42413c25d205d
182]
183[refactor: s/peer/server/ in immutable/upload, happinessutil.py, test_upload
184warner@lothar.com**20110227011100
185 Ignore-this: 7ea858755cbe5896ac212a925840fe68
186 
187 No behavioral changes, just updating variable/method names and log messages.
188 The effects outside these three files should be minimal: some exception
189 messages changed (to say "server" instead of "peer"), and some internal class
190 names were changed. A few things still use "peer" to minimize external
191 changes, like UploadResults.timings["peer_selection"] and
192 happinessutil.merge_peers, which can be changed later.
193]
194[storage_client.py: clean up test_add_server/test_add_descriptor, remove .test_servers
195warner@lothar.com**20110227011056
196 Ignore-this: efad933e78179d3d5fdcd6d1ef2b19cc
197]
198[test_client.py, upload.py:: remove KiB/MiB/etc constants, and other dead code
199warner@lothar.com**20110227011051
200 Ignore-this: dc83c5794c2afc4f81e592f689c0dc2d
201]
202[test: increase timeout on a network test because Francois's ARM machine hit that timeout
203zooko@zooko.com**20110317165909
204 Ignore-this: 380c345cdcbd196268ca5b65664ac85b
205 I'm skeptical that the test was proceeding correctly but ran out of time. It seems more likely that it had gotten hung. But if we raise the timeout to an even more extravagant number then we can be even more certain that the test was never going to finish.
206]
207[docs/configuration.rst: add a "Frontend Configuration" section
208Brian Warner <warner@lothar.com>**20110222014323
209 Ignore-this: 657018aa501fe4f0efef9851628444ca
210 
211 this points to docs/frontends/*.rst, which were previously underlinked
212]
213[web/filenode.py: avoid calling req.finish() on closed HTTP connections. Closes #1366
214"Brian Warner <warner@lothar.com>"**20110221061544
215 Ignore-this: 799d4de19933f2309b3c0c19a63bb888
216]
217[Add unit tests for cross_check_pkg_resources_versus_import, and a regression test for ref #1355. This requires a little refactoring to make it testable.
218david-sarah@jacaranda.org**20110221015817
219 Ignore-this: 51d181698f8c20d3aca58b057e9c475a
220]
221[allmydata/__init__.py: .name was used in place of the correct .__name__ when printing an exception. Also, robustify string formatting by using %r instead of %s in some places. fixes #1355.
222david-sarah@jacaranda.org**20110221020125
223 Ignore-this: b0744ed58f161bf188e037bad077fc48
224]
225[Refactor StorageFarmBroker handling of servers
226Brian Warner <warner@lothar.com>**20110221015804
227 Ignore-this: 842144ed92f5717699b8f580eab32a51
228 
229 Pass around IServer instance instead of (peerid, rref) tuple. Replace
230 "descriptor" with "server". Other replacements:
231 
232  get_all_servers -> get_connected_servers/get_known_servers
233  get_servers_for_index -> get_servers_for_psi (now returns IServers)
234 
235 This change still needs to be pushed further down: lots of code is now
236 getting the IServer and then distributing (peerid, rref) internally.
237 Instead, it ought to distribute the IServer internally and delay
238 extracting a serverid or rref until the last moment.
239 
240 no_network.py was updated to retain parallelism.
241]
242[TAG allmydata-tahoe-1.8.2
243warner@lothar.com**20110131020101]
244Patch bundle hash:
245cba5b5df7d5cefc95b1d9cf0d65a1645d4de8d4e