meejah
4fe65a8efd
brackets are hard
2020-12-14 15:57:03 -07:00
meejah
4884f81235
brackets are important
2020-12-14 15:49:42 -07:00
meejah
38968b4034
correct merge resolution
2020-12-14 13:53:56 -07:00
meejah
bf799c1cf8
Merge branch 'master' into 2916.grid-manager-proposal.5
...
Conflicts:
src/allmydata/storage_client.py
src/allmydata/test/common_util.py
2020-12-14 13:44:42 -07:00
meejah
706d3085da
create directories on save
2020-12-14 13:42:51 -07:00
Jean-Paul Calderone
1c7c228f90
Merge remote-tracking branch 'origin/master' into 3549.remove-stats-gatherer
2020-12-10 18:27:54 -05:00
Jean-Paul Calderone
e8e928aced
Remove the web view onto the removed metrics
2020-12-10 18:24:00 -05:00
Itamar Turner-Trauring
e9b0a526bd
Merge branch 'master' into 3551.more-immutable-python-3
2020-12-10 10:06:53 -05:00
Jean-Paul Calderone
4ac95a1ede
Merge remote-tracking branch 'origin/master' into 3522.test_alias-no-mock
2020-12-10 07:19:43 -05:00
Jean-Paul Calderone
6f80862ec5
Slightly clean up formatting implementation
2020-12-10 07:19:27 -05:00
Jean-Paul Calderone
066e98874b
Point at do_cli_unicode here too
2020-12-10 07:17:24 -05:00
Jean-Paul Calderone
d0c22a529e
json.dumps output should always be ascii
2020-12-10 07:16:00 -05:00
Jean-Paul Calderone
2f53225765
better helper name
2020-12-10 07:06:01 -05:00
Jean-Paul Calderone
4bb28cadcb
motivate its existence a bit more
2020-12-10 07:04:28 -05:00
Jean-Paul Calderone
c39f7721af
run_cli_bytes docstring
2020-12-10 07:03:24 -05:00
Itamar Turner-Trauring
63ff67a7be
Ported to Python 3.
2020-12-09 13:33:01 -05:00
Itamar Turner-Trauring
eb55c10eea
Tests pass on Python 3.
2020-12-09 13:28:16 -05:00
Itamar Turner-Trauring
baed5fd734
Port to Python 3.
2020-12-09 13:22:51 -05:00
Jean-Paul Calderone
9a27254afa
unused import
2020-12-09 10:39:03 -05:00
Jean-Paul Calderone
9412cf70c2
remove unused helper
2020-12-09 10:36:17 -05:00
Jean-Paul Calderone
d7ec5a19be
Don't implement the stats gatherer or support configuring or talking to one
2020-12-09 10:34:16 -05:00
Jean-Paul Calderone
3fd1b336b4
Don't test stats gatherer support in the runner
2020-12-09 10:32:49 -05:00
Jean-Paul Calderone
d916c725e6
Don't set up or query a stats gatherer in test_system
2020-12-09 10:32:26 -05:00
Itamar Turner-Trauring
67549aaed5
Merge remote-tracking branch 'origin/master' into 3456.introducer-python3
2020-12-09 09:21:02 -05:00
Itamar Turner-Trauring
0cf9be18d7
Merge remote-tracking branch 'origin/master' into 3544.furls-not-bytes-maybe
2020-12-08 16:08:12 -05:00
Itamar Turner-Trauring
754b88a0b9
Fix failing test.
2020-12-08 13:47:53 -05:00
Jean-Paul Calderone
69d3dad646
Get rid of remote_host / get_remote_host
...
Nothing uses it and if we don't provide it we don't need getLocationHints
2020-12-08 10:37:31 -05:00
Jean-Paul Calderone
eddf7fd8f9
Remove the pre-generated key/certificate
2020-12-08 10:34:25 -05:00
Itamar Turner-Trauring
dcd865897e
Merge branch 'master' into 3544.furls-not-bytes-maybe
2020-12-08 10:30:00 -05:00
Itamar Turner-Trauring
0b7c0bf451
Document furl type.
2020-12-08 10:28:47 -05:00
Jean-Paul Calderone
ca5a64236d
Merge remote-tracking branch 'origin/master' into HEAD
2020-12-08 09:52:11 -05:00
Jean-Paul Calderone
d83e4790c3
Let subscribed_to get initialized right
2020-12-07 13:14:00 -05:00
Jean-Paul Calderone
d415bda72a
Merge branch 'master' into 3521.test_storage_client-no-mock
2020-12-07 12:03:50 -05:00
Jean-Paul Calderone
61ee26fb00
ticket reference
2020-12-07 10:46:20 -05:00
Jean-Paul Calderone
1a77ba5698
remove redundant u prefix
2020-12-07 10:37:25 -05:00
Jean-Paul Calderone
d6d64f6b27
fix the json case
2020-12-07 10:37:22 -05:00
Jean-Paul Calderone
87e808b392
one more switch
2020-12-07 10:18:05 -05:00
Jean-Paul Calderone
c7358e6639
Switch over to the helper in the two functions that matter for this PR
2020-12-07 10:16:48 -05:00
Jean-Paul Calderone
a8e3424ef6
remove another unrelated change that's no longer required
2020-12-07 09:55:27 -05:00
Jean-Paul Calderone
d2664121b9
backout no-longer required unrelated change
2020-12-07 09:51:34 -05:00
Jean-Paul Calderone
72744c9464
more docstrings and properly support (and use) encoding=None throughout
2020-12-07 09:47:48 -05:00
Jean-Paul Calderone
05d271c7c8
a little more exposition
2020-12-07 09:26:58 -05:00
Jean-Paul Calderone
7b3a5aceb8
These tests can't reach any of the codepaths where quote_output matters
...
So simplify
2020-12-07 09:21:56 -05:00
Jean-Paul Calderone
f4432d3f23
Respect the provided encoding
...
UTF-8 is great but if we're claiming the encoding is something else everywhere
else we can't just make it UTF-8 here.
2020-12-07 09:12:38 -05:00
Jean-Paul Calderone
56f141e170
decode instead of encoding in maybe_decode
...
legacy from when the bytes/unicode tower was upsidedown compared to how it is now
2020-12-07 09:12:04 -05:00
Jean-Paul Calderone
72a5b571ca
Only test the cases we can make work everywhere
...
These tests previously (in this branch) tried to exercise more ``show_output``
logic than they can actually reach due to the requirement that argv be
interpretable. Shrink the test suite down to just what we can squeeze through
argv and deal with fully testing ``show_output`` elsewhere.
2020-12-07 09:10:59 -05:00
Jean-Paul Calderone
93b30d0dde
The implementation can't reliably see the encoding we're faking without this
2020-12-07 09:06:21 -05:00
Jean-Paul Calderone
8ca98bb8ca
using run_cli_unicode, better expect unicode result
2020-12-07 09:06:00 -05:00
Jean-Paul Calderone
c12b082fa7
Put run_cli back largely how it was
...
Also deal with StringIO better in show_output
2020-12-06 20:37:28 -05:00
Jean-Paul Calderone
613777d166
Make sure this one is bytes too
2020-12-06 19:23:13 -05:00
