Ticket #1055: web_common_25.dpatch

File web_common_25.dpatch, 2.5 KB (added by jacoblyles, at 2010-07-30T21:27:16Z)

This patch fixes an error with interpolating float values in "%d" format strings in python 2.5

Line 
11 patch for repository http://allmydata.org/source/tahoe-lafs/trunk:
2
3Fri Jul 30 14:05:49 PDT 2010  jacob.lyles@gmail.com
4  * web/common fix
5
6New patches:
7
8[web/common fix
9jacob.lyles@gmail.com**20100730210549
10 Ignore-this: 9db8ef66bd6277d85957c497214506dd
11] {
12hunk ./src/allmydata/web/common.py 88
13     if s >= 1.0:
14         return "%.2fs" % s
15     if s >= 0.01:
16-        return "%dms" % (1000*s)
17+        return "%.0fms" % (1000*s)
18     if s >= 0.001:
19         return "%.1fms" % (1000*s)
20hunk ./src/allmydata/web/common.py 91
21-    return "%dus" % (1000000*s)
22+    return "%.0fus" % (1000000*s)
23 
24 def abbreviate_rate(data):
25     # 21.8kBps, 554.4kBps 4.37MBps
26hunk ./src/allmydata/web/common.py 102
27         return "%1.2fMBps" % (r/1000000)
28     if r > 1000:
29         return "%.1fkBps" % (r/1000)
30-    return "%dBps" % r
31+    return "%.0fBps" % r
32 
33 def abbreviate_size(data):
34     # 21.8kB, 554.4kB 4.37MB
35hunk ./src/allmydata/web/common.py 115
36         return "%1.2fMB" % (r/1000000)
37     if r > 1000:
38         return "%.1fkB" % (r/1000)
39-    return "%dB" % r
40+    return "%.0fB" % r
41 
42 def plural(sequence_or_length):
43     if isinstance(sequence_or_length, int):
44}
45
46Context:
47
48[misc/build_helpers/run-with-pythonpath.py: fix stale comment, and remove 'trial' example that is not the right way to run trial.
49david-sarah@jacaranda.org**20100726225729
50 Ignore-this: a61f55557ad69a1633bfb2b8172cce97
51] 
52[docs/specifications/dirnodes.txt: 'mesh'->'grid'.
53david-sarah@jacaranda.org**20100723061616
54 Ignore-this: 887bcf921ef00afba8e05e9239035bca
55] 
56[docs/specifications/dirnodes.txt: bring layer terminology up-to-date with architecture.txt, and a few other updates (e.g. note that the MAC is no longer verified, and that URIs can be unknown). Also 'Tahoe'->'Tahoe-LAFS'.
57david-sarah@jacaranda.org**20100723054703
58 Ignore-this: f3b98183e7d0a0f391225b8b93ac6c37
59] 
60[docs: use current cap to Zooko's wiki page in example text
61zooko@zooko.com**20100721010543
62 Ignore-this: 4f36f36758f9fdbaf9eb73eac23b6652
63 fixes #1134
64] 
65[__init__.py: silence DeprecationWarning about BaseException.message globally. fixes #1129
66david-sarah@jacaranda.org**20100720011939
67 Ignore-this: 38808986ba79cb2786b010504a22f89
68] 
69[test_runner: test that 'tahoe --version' outputs no noise (e.g. DeprecationWarnings).
70david-sarah@jacaranda.org**20100720011345
71 Ignore-this: dd358b7b2e5d57282cbe133e8069702e
72] 
73[TAG allmydata-tahoe-1.7.1
74zooko@zooko.com**20100719131352
75 Ignore-this: 6942056548433dc653a746703819ad8c
76] 
77Patch bundle hash:
784418b4299917e77f0b268f98e0d12332d98739d7