Ticket #1557: fix-1557.darcs.patch

2 patches for repository http://tahoe-lafs.org/source/tahoe/trunk:

Fri Oct  7 04:29:58 BST 2011  david-sarah@jacaranda.org
  * Makefile: include misc/ directories other than misc/build_helpers in SOURCES. refs #1557

Fri Oct  7 04:30:31 BST 2011  david-sarah@jacaranda.org
  * Fix pyflakes warnings in misc/ directories other than misc/build_helpers. refs #1557

New patches:

[Makefile: include misc/ directories other than misc/build_helpers in SOURCES. refs #1557
david-sarah@jacaranda.org**20111007032958
 Ignore-this: 31376ec01401df7972e83341dc65aa05
] hunk ./Makefile 13
 # itself. It will also create it in the beginning of the 'develop' command.
 
 TAHOE=$(PYTHON) bin/tahoe
-SOURCES=src/allmydata src/buildtest static misc/build_helpers bin/tahoe-script.template twisted setup.py
+SOURCES=src/allmydata src/buildtest static misc bin/tahoe-script.template twisted setup.py
 
 .PHONY: make-version build
 
[Fix pyflakes warnings in misc/ directories other than misc/build_helpers. refs #1557
david-sarah@jacaranda.org**20111007033031
 Ignore-this: 7daf5862469732d8cabc355266622b74
] {
hunk ./misc/coding_tools/check-interfaces.py 104
 
 $Id$
 """
-from zope.interface.exceptions import BrokenImplementation, DoesNotImplement
+from zope.interface.exceptions import DoesNotImplement
 from zope.interface.exceptions import BrokenMethodImplementation
 from types import FunctionType, MethodType
 from zope.interface.interface import fromMethod, fromFunction, Method
hunk ./misc/operations_helpers/spacetime/diskwatcher.py 23
     avail = integer()
 
 def upgradeSample1to2(old):
-    total = 0
     return old.upgradeVersion("diskwatcher_sample", 1, 2,
                               url=old.url,
                               when=old.when,
hunk ./misc/simulators/ringsim.py 5
 
 # used to discuss ticket #302: "stop permuting peerlist?"
 
-import time
+# import time
 import math
hunk ./misc/simulators/ringsim.py 7
-from hashlib import sha1, md5, sha256
+from hashlib import md5  # sha1, sha256
 myhash = md5
 # md5: 1520 "uploads" per second
 # sha1: 1350 ups
hunk ./misc/simulators/ringsim.py 171
 def do_run(ring, opts):
     avg_space_per_file = avg_filesize * opts["N"] / opts["k"]
     fileseed = opts["fileseed"]
-    start = time.time()
     all_servers_have_room = True
     no_files_have_wrapped = True
     for filenum in count(0):
hunk ./misc/simulators/ringsim.py 230
     seed = opts["seed"]
 
     ring = Ring(opts["servers"], seed, opts["permute"])
-    num_files = do_run(ring, opts)
+    do_run(ring, opts)
 
 def run(opts):
     do_ring(opts)
hunk ./misc/simulators/simulator.py 57
         return (True, tried)
 
     def accept_share(self, fileid, sharesize):
-        accept = False
         if self.utilization < self.capacity:
             # we have room! yay!
             self.shares[fileid] = sharesize
hunk ./misc/simulators/simulator.py 246
     def do_event(self):
         time, etype = self.next.pop(0)
         assert time > self.time
-        current_time = self.time
+        # current_time = self.time
         self.time = time
         self._add_event(etype)
         if etype == "ADDFILE":
}

Context:

[no_network.py: Clean up whitespace around code changed by previous patch.
david-sarah@jacaranda.org**20111004010407
 Ignore-this: 647ec8a9346dca1a41212ab250619b72
] 
[no_network.py: Fix potential bugs in some tests due to capture of slots in for loops.
david-sarah@jacaranda.org**20111004010231
 Ignore-this: 9c496877613a3befd54979e5de6e63d2
] 
[docs: fix the rst formatting of COPYING.TGPPL.rst
zooko@zooko.com**20111003043333
 Ignore-this: c5fbc83f4a3db81a0c95b27053c463c5
 Now it renders correctly both on trac and with rst2html --verbose from docutils v0.8.1.
] 
[MDMF: remove extension fields from caps, tolerate arbitrary ones. Fixes #1526
Brian Warner <warner@lothar.com>**20111001233553
 Ignore-this: 335e1690aef1146a2c0b8d8c18c1cb21
 
 The filecaps used to be produced with hints for 'k' and segsize, but they
 weren't actually used, and doing so had the potential to limit how we change
 those filecaps in the future. Also the parsing code had some problems dealing
 with other numbers of extensions. Removing the existing fields and making the
 parser tolerate (and ignore) extra ones makes MDMF more future-proof.
] 
[test/test_runner.py: BinTahoe.test_path has rare nondeterministic failures; this patch probably fixes a problem where the actual cause of failure is masked by a string conversion error.
david-sarah@jacaranda.org**20110927225336
 Ignore-this: 6f1ad68004194cc9cea55ace3745e4af
] 
[docs/configuration.rst: add section about the types of node, and clarify when setting web.port enables web-API service. fixes #1444
zooko@zooko.com**20110926203801
 Ignore-this: ab94d470c68e720101a7ff3c207a719e
] 
[TAG allmydata-tahoe-1.9.0a2
warner@lothar.com**20110925234811
 Ignore-this: e9649c58f9c9017a7d55008938dba64f
] 
Patch bundle hash:
24a97aa01065ec06036423d39199eef763dea121