ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-01 02:36:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,036 Commits 185 Branches 90 Tags 89 MiB
5253c47c5e
Commit Graph

7706 Commits

Author SHA1 Message Date
Itamar Turner-Trauring
9137da5483 Stick to Unicode when possible. 2021-04-30 10:16:41 -04:00
Itamar Turner-Trauring
ef36e0e02a Merge remote-tracking branch 'origin/master' into 3678.cli-tests-python-3 2021-04-28 13:17:37 -04:00
Itamar Turner-Trauring
904b423b48 Merge remote-tracking branch 'origin/master' into 3672.non-utf-8-bytes-in-logs 2021-04-28 13:17:07 -04:00
Itamar Turner-Trauring
2ad8a47455 Fix flake. 2021-04-26 09:59:18 -04:00
Itamar Turner-Trauring
04a09558b6 Port to Python 3. 2021-04-26 09:54:35 -04:00
Itamar Turner-Trauring
eb5211672c Tests pass on Python 3. 2021-04-26 09:46:21 -04:00
Jason R. Coombs
6142168977
Merge pull request #1038 from tahoe-lafs/3652.remove-account.url 
3652 Remove STFPd account.url support.
 2021-04-23 10:21:53 -04:00
Itamar Turner-Trauring
b85d735b8b Even more progress towards Python 3 tests passing. 2021-04-22 10:43:55 -04:00
Itamar Turner-Trauring
56e4385103 More progress towards Python 3 tests passing. 2021-04-22 10:36:10 -04:00
Itamar Turner-Trauring
5927e14ece Merge branch '3678.cli-tests-python-3' into 3679.more-cli-tests-python-3 2021-04-22 10:28:26 -04:00
Itamar Turner-Trauring
a393b54315 Fix BytesWarning errors. 2021-04-22 10:27:59 -04:00
Itamar Turner-Trauring
b675ca2380 Lint fix. 2021-04-22 10:23:58 -04:00
Itamar Turner-Trauring
2aac69e0df More passing tests on Python 3. 2021-04-22 10:20:26 -04:00
Itamar Turner-Trauring
416813578a Some progress towards passing tests on Python 3. 2021-04-22 10:18:59 -04:00
Itamar Turner-Trauring
86fe350bef Tests pass on Python 2. 2021-04-22 10:15:43 -04:00
Itamar Turner-Trauring
567c0f019e Test random bytes. 2021-04-22 09:39:50 -04:00
Itamar Turner-Trauring
5ebb385c10 Port to Python 3. 2021-04-21 11:58:48 -04:00
Itamar Turner-Trauring
f6e0611b07 All tests pass on Python 3. 2021-04-21 11:42:05 -04:00
Itamar Turner-Trauring
5e59b9d8d6 A little closer to passing tests on Python 3. 2021-04-21 11:32:42 -04:00
Itamar Turner-Trauring
83e16d40a4 Some tests passing on Python 3. 2021-04-21 11:18:36 -04:00
Itamar Turner-Trauring
e090891935 In PyPy encode() doesn't call iterencode(). 2021-04-21 10:39:27 -04:00
Itamar Turner-Trauring
08cb514eee Correct parameter name. 2021-04-21 10:09:26 -04:00
Itamar Turner-Trauring
6e8dde3b14 Simplify. 2021-04-21 10:09:03 -04:00
Jason R. Coombs
1b46f981c6 Remove AccountURLChecker, the code that relies on it, associated tests, and docs. 2021-04-17 17:01:15 -04:00
Itamar Turner-Trauring
abb247b3cc Fix flake. 2021-04-16 12:01:07 -04:00
Itamar Turner-Trauring
fa46efdb3a Enable BytesWarnings in integration tests. 2021-04-16 11:58:37 -04:00
Itamar Turner-Trauring
61506f87bb Make BytesWarning->exception global, to ease use in integration tests. 2021-04-16 11:55:20 -04:00
Itamar Turner-Trauring
bc9e4ac728 Support quoting any-old-bytes correctly on Python 2. 2021-04-16 11:36:53 -04:00
Itamar Turner-Trauring
51ebbae15a Fix typo. 2021-04-16 11:21:47 -04:00
Itamar Turner-Trauring
19a3481e5f
Merge pull request #1042 from tahoe-lafs/3626.streaming-logs-with-bytes 
Handle bytes in log messages streamed over websocket

Fixes ticket:3626
 2021-04-16 11:21:28 -04:00
Itamar Turner-Trauring
d60bc2841a Oh right, Python 2 Eliot doesn't support custom JSON encoders. 2021-04-14 11:19:04 -04:00
Itamar Turner-Trauring
32607b5ada For logging, using a new JSON bytes encoder that works on any bytes string, not 
just UTF-8-encoded strings.
 2021-04-14 10:42:01 -04:00
Itamar Turner-Trauring
e242bf50c7 Handle bytes in log messages. 2021-04-14 09:56:27 -04:00
Itamar Turner-Trauring
953c06a18d Fix some plain-str()-of-bytes bugs. 2021-04-13 09:53:08 -04:00
Itamar Turner-Trauring
2299c2dcc8 Fix implicit str(bytesobj). 2021-04-13 09:40:24 -04:00
Itamar Turner-Trauring
4ea1f153cc
Merge pull request #1039 from tahoe-lafs/3674.cli-tests-python-3 
Port a bit more cli tests python 3

Fixes ticket:3674
 2021-04-13 09:39:13 -04:00
Itamar Turner-Trauring
cbd816fbd5 Ensure warnings get turned into exceptions. Getting sneaking suspicion it's passing in filenames sometimes, not just modules. 2021-04-13 09:34:55 -04:00
Itamar Turner-Trauring
3a832efc15 Merge branch '3674.cli-tests-python-3' into 3675.byteswarning-as-error-again 2021-04-13 09:22:16 -04:00
Itamar Turner-Trauring
b0e6c86085 Better error messages. 2021-04-13 09:21:26 -04:00
Itamar Turner-Trauring
43620a3c19 Port to Python 3. 2021-04-12 12:53:17 -04:00
Itamar Turner-Trauring
c3d2a26ee5 Remove unused imports. 2021-04-12 10:27:00 -04:00
Itamar Turner-Trauring
a0302c50da Fix a BytesWarning. 2021-04-12 10:25:15 -04:00
Itamar Turner-Trauring
2554112045 Handle Python 3 case where stdout by default is Unicode. 2021-04-12 10:17:12 -04:00
Itamar Turner-Trauring
e6532305bf Match Python 3 behavior for stdout/stderr. 2021-04-12 10:17:01 -04:00
Itamar Turner-Trauring
8512bdcd8d Even more progress towards passing Python 3 tests. 2021-04-12 09:51:53 -04:00
Itamar Turner-Trauring
069fcb91eb More progress towards passing Python 3 tests. 2021-04-12 09:35:34 -04:00
Itamar Turner-Trauring
06c4ed13b7 Some progress towards passing Python 3 tests. 2021-04-12 09:28:51 -04:00
Itamar Turner-Trauring
d6406d5edb Some progress towards passing backup tests on Python 3. 2021-04-07 10:44:48 -04:00
Itamar Turner-Trauring
9a17c4a5d2 Port to Python 3. 2021-04-07 09:28:04 -04:00
Itamar Turner-Trauring
803e00f6b1 Tests pass on Python 3. 2021-04-07 09:26:28 -04:00
Itamar Turner-Trauring
6f74bb7d88 Merge remote-tracking branch 'origin/master' into 3671.more-test-utilities-python-3 2021-04-07 09:11:31 -04:00
Itamar Turner-Trauring
01f75db2da
Merge pull request #1034 from tahoe-lafs/3667.test-utilities-python-3 
Port more of allmydata.test utility modules to Python 3

Fixes ticket:3667
 2021-04-07 09:10:46 -04:00
Itamar Turner-Trauring
ddcca38f31 Port to Python 3. 2021-04-06 10:51:14 -04:00
Itamar Turner-Trauring
315bb672d1 Port to Python 3. 2021-04-06 10:49:00 -04:00
Itamar Turner-Trauring
3429f8bf03 Port to Python 3. 2021-04-06 10:45:58 -04:00
Itamar Turner-Trauring
2257f89d39 More semantically robust test. 2021-04-06 10:45:44 -04:00
Itamar Turner-Trauring
044c79c4db Port to Python 3. 2021-04-06 10:29:29 -04:00
Itamar Turner-Trauring
ae7680759d Another checker script. 2021-04-06 10:22:47 -04:00
Itamar Turner-Trauring
abe3fbc2e5 Empty file. 2021-04-06 10:22:30 -04:00
Itamar Turner-Trauring
7f4a99306b No need to port to Python 3. 2021-04-06 10:04:18 -04:00
Itamar Turner-Trauring
3841662ee6 Fix tests on Python 3. 2021-04-06 09:23:31 -04:00
Itamar Turner-Trauring
7b5cb13417 Flake fix. 2021-04-05 13:02:17 -04:00
Itamar Turner-Trauring
57aa798814 Delete another item that was deleted. 2021-04-05 13:01:23 -04:00
Itamar Turner-Trauring
3bc9b0d544 Port to Python 3. 2021-04-05 13:00:27 -04:00
Itamar Turner-Trauring
74e9bdd476 No point in having separate module. 2021-04-05 12:56:42 -04:00
Itamar Turner-Trauring
a11b47785f Port to Python 3. 2021-04-05 12:52:42 -04:00
Itamar Turner-Trauring
a367d333d9 Port to Python 3. 2021-04-05 12:04:09 -04:00
Itamar Turner-Trauring
625a0abb02 Port to Python 3. 2021-04-05 11:37:32 -04:00
Itamar Turner-Trauring
a37121f89c Already ported. 2021-04-05 11:34:51 -04:00
Itamar Turner-Trauring
84e32882b4 These don't belong in tests module. 2021-04-05 11:30:33 -04:00
Itamar Turner-Trauring
80385aea8e Port to Python 3. 2021-04-05 11:29:13 -04:00
Itamar Turner-Trauring
eedc8f23cf Delete some unused code. 2021-04-05 11:28:59 -04:00
Itamar Turner-Trauring
b981e90de3 Tahoe-LAFS now relies on a sufficiently new version of Twisted, which includes this bugfix. 2021-04-05 11:28:59 -04:00
Itamar Turner-Trauring
d214fe3f16 Delete unused imports. 2021-04-02 13:00:05 -04:00
Itamar Turner-Trauring
9a96fec604 Use existing IRemoteReference implementation. 2021-04-02 12:56:49 -04:00
Itamar Turner-Trauring
c21288b3dd Make it easier to read. 2021-04-02 12:49:58 -04:00
Itamar Turner-Trauring
dd6e0d5467 Switch to decode_furl(). 2021-04-02 12:49:01 -04:00
Itamar Turner-Trauring
939f1f840b Fix reference to new location. 2021-04-02 12:48:50 -04:00
Itamar Turner-Trauring
fd1860705e Port to Python 3. 2021-04-01 10:58:50 -04:00
Itamar Turner-Trauring
003e9c62a8 Delete unused code paths. 2021-04-01 10:58:27 -04:00
Itamar Turner-Trauring
e92b88195c Port to Python 3. 2021-04-01 10:51:13 -04:00
Itamar Turner-Trauring
6127fc8cc7 Tests for rrefutil. 2021-04-01 10:49:59 -04:00
Itamar Turner-Trauring
062740dc23 Probably not worth unit testing a utility function used in one place, move it to 
place it's used.
 2021-04-01 10:23:37 -04:00
Itamar Turner-Trauring
9f02de688c We don't support old Foolscap versions anymore. 2021-04-01 10:19:16 -04:00
Itamar Turner-Trauring
f606420d78 Make it new-style. 2021-04-01 10:14:05 -04:00
Itamar Turner-Trauring
5ac631047c Port to Python 3. 2021-04-01 10:04:01 -04:00
Itamar Turner-Trauring
de2609151e Special logic for roundtripping Unicode to Unicode is only necessary on Python 2. 2021-04-01 10:02:11 -04:00
Itamar Turner-Trauring
8439f2820b Port to Python 3. 2021-03-31 10:53:02 -04:00
Itamar Turner-Trauring
1ef33d3d69 Note download_to_data() is tested elsewhere. 2021-03-31 10:50:50 -04:00
Itamar Turner-Trauring
d3a8094630 Merge branch '3658.end-progress' into 3657.util-python-3 2021-03-31 10:43:39 -04:00
Itamar Turner-Trauring
0d0dd4dee9 Rip out all references to the unused IProgress API. 2021-03-31 10:35:25 -04:00
Itamar Turner-Trauring
1ead68d061 Start of tests for consumer.py. 2021-03-31 10:10:05 -04:00
Itamar Turner-Trauring
fbcb9bef29 Delete unused code. 2021-03-31 10:09:54 -04:00
Itamar Turner-Trauring
69ece36509
Merge pull request #1018 from tahoe-lafs/3603.scripts-runner-full 
3603 Port runner script to Python 3

Fixes ticket:3656
 2021-03-31 09:31:31 -04:00
Itamar Turner-Trauring
45e21f8f70 Port to Python 3. 2021-03-30 11:05:49 -04:00
Itamar Turner-Trauring
90c393b8b2 Port __init__.py modules to Python 3 (or just mark them as ported if they're empty). 2021-03-30 10:04:28 -04:00
Itamar Turner-Trauring
43f1f115cb Simplify. 2021-03-30 09:46:56 -04:00
Itamar Turner-Trauring
bc20457a61 Merge remote-tracking branch 'origin/master' into 3603.scripts-runner-full 2021-03-30 09:42:24 -04:00
Sajith Sasidharan
c392a334fc Pacify Python 3 
`b"foo"` is `str` in Python 2, `bytes` in Python 3
 2021-03-27 11:26:27 -04:00
Jason R. Coombs
a6147b05b1 Fix test failure in test_unicode_arguments_and_output on Python 2. 2021-03-26 11:24:39 -04:00
Jason R. Coombs
110e77b560 Mark module as ported 2021-03-26 09:52:52 -04:00
Jason R. Coombs
bfef77a396 Port runner to Python 3. 2021-03-26 09:52:47 -04:00
Jean-Paul Calderone
7ce7cf7f24
Merge pull request #1016 from LeastAuthority/3650.tahoe-invite-regression 
Fix regression in `tahoe invite` w/o shares parameters

Fixes: ticket:3650
 2021-03-25 20:09:55 -04:00
Itamar Turner-Trauring
8099929dec
Merge pull request #1013 from tahoe-lafs/3647.more-cli-python-3 
Port allmydata.test.cli.test_invite to Python 3

Fixes ticket:3647
 2021-03-25 10:19:49 -04:00
Jean-Paul Calderone
00de3b9e7e type cleanups 2021-03-24 13:54:10 -04:00
Jean-Paul Calderone
3963979fbd Test and fix tahoe invite w/o share arguments 2021-03-24 13:23:19 -04:00
Itamar Turner-Trauring
590f71ad10
Merge pull request #1012 from tahoe-lafs/3646.backupdb-python-3 
Port test_backupdb to Python 3

Fixes ticket:3646
 2021-03-23 16:13:44 -04:00
Jean-Paul Calderone
5b7f0f2477
Merge pull request #1004 from LeastAuthority/3638.mypy-vs-allmydata-scripts 
Fix src/allmydata/scripts/ mypy errors

Fixes: ticket:3638
 2021-03-23 16:06:33 -04:00
Itamar Turner-Trauring
4b0aa41256 Fix flake. 2021-03-23 11:04:00 -04:00
Itamar Turner-Trauring
15d6ab610d Port to Python 3. 2021-03-23 10:55:14 -04:00
Itamar Turner-Trauring
e140dc06ea Tests pass on Python 3. 2021-03-23 10:53:53 -04:00
Itamar Turner-Trauring
d182ba8283 Utility to dump JSON to bytes. 2021-03-23 10:53:10 -04:00
Itamar Turner-Trauring
4005d90024 Ensure the fake matches the real Wormhole interface. 2021-03-23 10:42:29 -04:00
Itamar Turner-Trauring
8396e9e24d Port to Python 3. 2021-03-23 10:07:24 -04:00
Itamar Turner-Trauring
f0e634af4f Move to correct directory. 2021-03-23 10:03:50 -04:00
Itamar Turner-Trauring
b1b70cc61c Tests pass on Python 3. 2021-03-23 10:02:01 -04:00
Itamar Turner-Trauring
4257f22d77
Merge pull request #1006 from tahoe-lafs/3640.tor-i2p-tests-python-3 
Port tor and i2p provider modules to Python 3

Fixes ticket:3640
 2021-03-23 09:49:58 -04:00
Itamar Turner-Trauring
28662eef0e
Merge pull request #1005 from tahoe-lafs/3634.cli-tests-python-3 
Start porting CLI tests to Python 3

Fixes ticket:3634
 2021-03-19 13:59:46 -04:00
Itamar Turner-Trauring
e091d4d0aa Body should be bytes. 2021-03-18 13:29:56 -04:00
Itamar Turner-Trauring
f9d0116283 Fix typo. 2021-03-18 13:29:50 -04:00
Itamar Turner-Trauring
185face21f Port to Python 3. 2021-03-18 11:57:07 -04:00
Itamar Turner-Trauring
e148fef19f Port to Python 3. 2021-03-18 11:55:42 -04:00
Itamar Turner-Trauring
be25d578c5 Port to Python 3. 2021-03-18 11:53:07 -04:00
Itamar Turner-Trauring
3ef69f2738 Port to Python 3. 2021-03-18 11:51:25 -04:00
Itamar Turner-Trauring
334093e28c All tests pass on Python 3. 2021-03-18 11:49:27 -04:00
Itamar Turner-Trauring
045b6085ff Port to Python 3. 2021-03-18 11:30:48 -04:00
Itamar Turner-Trauring
2dfaa3ac2f Ported to Python 3. 2021-03-18 11:08:23 -04:00
Itamar Turner-Trauring
2f25950944 All tests pass on Python 3. 2021-03-18 11:00:49 -04:00
Itamar Turner-Trauring
919930173e More progress towards Python 3. 2021-03-18 10:56:20 -04:00
Itamar Turner-Trauring
b7d6b97f63 Some progress towards passing tests on Python 3. 2021-03-18 10:42:15 -04:00
Itamar Turner-Trauring
34f1f43e95 Revert changes to tahoe_backup/test_backup for now. 2021-03-18 10:33:10 -04:00
Jean-Paul Calderone
0464e9f5ab Merge remote-tracking branch 'origin/master' into 3638.mypy-vs-allmydata-scripts 2021-03-17 21:23:28 -04:00
Jean-Paul Calderone
e15c4184f4
Merge pull request #1003 from LeastAuthority/3637.mypy-vs-allmydata-test 
Fix src/allmydata/test mypy errors w/ Twisted 21.2.0 

Fixes: ticket:3637
 2021-03-17 21:20:14 -04:00
Itamar Turner-Trauring
47cb644fbb
Merge pull request #990 from tahoe-lafs/3621.port-testing 
Port testing to Python 3

Fixes ticket:3621
 2021-03-17 16:05:54 -04:00
Itamar Turner-Trauring
dddcff093d
Merge pull request #975 from tahoe-lafs/3603.scripts 
Port scripts.create_node to Python 3

Fixes ticket:3603
 2021-03-17 16:05:23 -04:00
Itamar Turner-Trauring
56efe7ae48 Merge branch '3603.scripts' into 3634.cli-tests-python-3 2021-03-17 15:33:18 -04:00
Itamar Turner-Trauring
2eba96de61 Address review comments. 2021-03-17 15:29:00 -04:00
Jean-Paul Calderone
b879314194 Make these byte strings explicitly byte strings 2021-03-17 15:21:22 -04:00
Jean-Paul Calderone
84cc7c5b84 Tell mypy about the types of optFlags and optParameters 2021-03-17 15:21:16 -04:00
Jean-Paul Calderone
6955154824 Allow SubCommands to be defined with any Options 2021-03-17 15:17:19 -04:00
Itamar Turner-Trauring
ca125193cf Fix module name. 2021-03-17 15:08:21 -04:00
Itamar Turner-Trauring
95ba731214 Merge remote-tracking branch 'origin/master' into 3621.port-testing 2021-03-17 15:08:07 -04:00
Itamar Turner-Trauring
6f40bd1da1
Merge pull request #1001 from tahoe-lafs/3635.tests-python-3 
Port more tests to Python 3

Fixes ticket:3635
 2021-03-17 15:06:23 -04:00
Jean-Paul Calderone
950a03cf64 ignore two examples of this error 
and link to twisted bug report about it
 2021-03-17 14:34:32 -04:00
Jean-Paul Calderone
9ae3f2074f use the inherited implementation! 2021-03-17 14:34:19 -04:00
Jean-Paul Calderone
9425197832 twisted.trial.unittest has no main, oops 2021-03-17 14:34:09 -04:00
Jean-Paul Calderone
ac6b2c6177 add missing producer method to this dummy 2021-03-17 14:33:58 -04:00
Jean-Paul Calderone
4c15db2019 ignore this impossible-to-fix error 
also link to a twisted bug report for making it possible
 2021-03-17 14:33:32 -04:00
Itamar Turner-Trauring
706b77aaea Port to Python 3. 2021-03-15 11:08:09 -04:00
Itamar Turner-Trauring
47f2c143d0 Tests pass on Python 3. 2021-03-15 11:07:03 -04:00
Itamar Turner-Trauring
01ee67fa43 Port to Python 3. 2021-03-15 11:03:39 -04:00
Itamar Turner-Trauring
dee9f622a9 Tests pass on Python 3. 2021-03-15 11:01:56 -04:00
Itamar Turner-Trauring
3c8e18f0fc Merge remote-tracking branch 'origin/master' into 3603.scripts 2021-03-15 10:50:13 -04:00
Itamar Turner-Trauring
65967c23e4
Merge pull request #995 from tahoe-lafs/3625.client-python-3 
Port allmydata.client to Python 3

Fixes ticket:3625
 2021-03-15 10:49:49 -04:00
Itamar Turner-Trauring
44374487c7 Some progress towards passing tests on Python 3. 2021-03-15 10:37:03 -04:00
Itamar Turner-Trauring
4d80177b18 Merge branch '3603.scripts' into 3634.cli-tests-python-3 2021-03-15 10:36:56 -04:00
Itamar Turner-Trauring
6e9a3fa3e9 Add back hard-coded expected results. 2021-03-15 10:08:52 -04:00
Itamar Turner-Trauring
1fde7fc007 Fix import. 2021-03-15 09:58:31 -04:00
Itamar Turner-Trauring
876235382e Port to Python 3. 2021-03-15 09:50:28 -04:00
Itamar Turner-Trauring
f147669071 Tests pass on Python 3. 2021-03-15 09:44:36 -04:00
Itamar Turner-Trauring
1c59d349ba It was always bytes. 2021-03-15 09:42:18 -04:00
Itamar Turner-Trauring
425313457b Make sure we're not doing "%s" % (bytes_). 2021-03-15 09:41:56 -04:00
Chad Whitacre
6752e68d40 Review files, pick off a typo 2021-03-15 06:15:47 -04:00
Chad Whitacre
0056809a55 Clean up error message (for mypy) 2021-03-14 17:36:38 -04:00
Chad Whitacre
bde424c7f9 Finish porting testing & test_testing 2021-03-13 09:00:01 -05:00
Chad Whitacre
4b6f84b821 Port testing to Python 3 2021-03-13 07:38:13 -05:00
Itamar Turner-Trauring
68d342ee29 Get rid of trailing whitespace. 2021-03-12 11:26:14 -05:00
Itamar Turner-Trauring
7c2a0685bb Port test_create.py to Python 3. 2021-03-12 11:22:19 -05:00
Itamar Turner-Trauring
719c729d01 Appears to already be ported. 2021-03-09 11:38:50 -05:00
Itamar Turner-Trauring
9a7add2599 It was empty. 2021-03-09 11:36:11 -05:00
Itamar Turner-Trauring
183b80fe25 Fix flake. 2021-03-09 11:33:52 -05:00
Itamar Turner-Trauring
4b0b3e9a4d Port to Python 3. 2021-03-09 11:30:47 -05:00
Itamar Turner-Trauring
ba6c4adba0 All tests pass on Python 3 (albeit skipping some CLI-specific tests). 2021-03-09 11:14:17 -05:00
Itamar Turner-Trauring
6f264a60e3 A couple tests passing on Python 3. 2021-03-09 11:10:48 -05:00
Jason R. Coombs
ee99c610b3 argv_type on Windows can be either 2021-03-06 16:06:24 -05:00
Jason R. Coombs
c673726139 Alongside unicode_to_argv, declare the argv type to avoid errors on Windows now that args are actually unicode. 2021-03-06 15:37:29 -05:00
Jason R. Coombs
0838133006 Merge branch 'master' into 3603.scripts 2021-03-06 10:43:01 -05:00
Itamar Turner-Trauring
2b9e1996ec Fix Python 2 regression. 2021-03-05 10:34:56 -05:00
Itamar Turner-Trauring
5e8899516e Merge remote-tracking branch 'origin/master' into 3625.client-python-3 2021-03-05 10:27:17 -05:00
Itamar Turner-Trauring
d6fc3c078e Port to Python 3. 2021-03-05 10:26:38 -05:00
Itamar Turner-Trauring
f2970f1b16 Port to Python 3. 2021-03-05 10:19:24 -05:00
Itamar Turner-Trauring
437ab58412 Fix flakes. 2021-03-05 09:45:07 -05:00
Itamar Turner-Trauring
5dd33d295e Merge branch '3618.bb-tests-python-3' into 3624.web-python-3-part-5 2021-03-05 09:43:39 -05:00
Itamar Turner-Trauring
0125deb603 Fix typo. 2021-03-05 09:41:49 -05:00
Itamar Turner-Trauring
41f5b5f25d Merge remote-tracking branch 'origin/master' into 3618.bb-tests-python-3 2021-03-05 09:41:17 -05:00
Itamar Turner-Trauring
a29c03d34b Port to Python 3. 2021-03-04 11:02:36 -05:00
Itamar Turner-Trauring
cf418b753a All tests pass on Python 3. 2021-03-04 10:55:08 -05:00
Itamar Turner-Trauring
2c3353f2fa More tests passing on Python 3. 2021-03-03 14:42:55 -05:00
Itamar Turner-Trauring
5ec52f9885 More passing tests on Python 3. 2021-03-03 14:14:55 -05:00
Itamar Turner-Trauring
58149afeb9 Merge branch '3618.bb-tests-python-3' into 3625.client-python-3 2021-03-03 10:51:15 -05:00
Itamar Turner-Trauring
996a564c05 Private key should be bytes. 2021-03-03 10:50:44 -05:00
Chad Whitacre
de3676e955
Merge pull request #989 from tahoe-lafs/3620.port-check_results 
Port check_results.py to Python 3
 2021-03-02 21:40:17 -05:00
Itamar Turner-Trauring
0647b63681 Port to Python 3. 2021-03-02 09:35:34 -05:00
Itamar Turner-Trauring
7b1911620f Port to Python 3. 2021-03-02 09:31:35 -05:00
Itamar Turner-Trauring
196435784e Port to Python 3. 2021-03-02 09:24:29 -05:00
Itamar Turner-Trauring
66a0628751 Merge branch '3618.bb-tests-python-3' into 3624.web-python-3-part-5 2021-03-02 09:14:23 -05:00
Itamar Turner-Trauring
80ab032a21 Fix typo. 2021-03-02 09:14:10 -05:00
Itamar Turner-Trauring
5359207ce3 Merge branch '3618.bb-tests-python-3' into 3624.web-python-3-part-5 2021-03-02 09:09:47 -05:00
Itamar Turner-Trauring
e1ef9d49cd
Merge pull request #987 from tahoe-lafs/3617.web-python-3-part-4 
Port allmydata.web to Python 3, part 4.

Fixes ticket:3617
 2021-03-02 09:08:30 -05:00
Itamar Turner-Trauring
f75eda1255 Merge remote-tracking branch 'origin/master' into 3618.bb-tests-python-3 2021-03-02 09:00:09 -05:00
Itamar Turner-Trauring
6fc44f7a31 get_name() should always return bytes, apparently. 2021-03-01 10:53:25 -05:00
Chad Whitacre
4cb7a65aa1 Port check_results.py to Python 3 2021-02-27 15:40:36 -05:00
Chad Whitacre
701ce50a37
Merge pull request #977 from tahoe-lafs/3605.port-control 
Port control.py to Python 3
 2021-02-27 14:23:14 -05:00
Itamar Turner-Trauring
9d13e82db7 Fix flake. 2021-02-24 14:44:29 -05:00
Itamar Turner-Trauring
70c0607789 Enable BytesWarning across all tests ported to Python 3, fixing problems that caught. 2021-02-24 14:36:15 -05:00
Itamar Turner-Trauring
0af83d0e88 Fix flake. 2021-02-23 10:43:53 -05:00
Itamar Turner-Trauring
2c32318d85 Merge remote-tracking branch 'origin/master' into 3617.web-python-3-part-4 2021-02-23 10:33:52 -05:00
Itamar Turner-Trauring
99db408a46 Port to Python 3. 2021-02-23 10:03:58 -05:00
Itamar Turner-Trauring
b52ab3d230 Ported to Python 3. 2021-02-23 09:14:16 -05:00
Itamar Turner-Trauring
d0bdf1fc8a Port to Python 3. 2021-02-22 10:31:43 -05:00
Itamar Turner-Trauring
0de48ba5b2 Explanation. 2021-02-22 10:20:09 -05:00
Itamar Turner-Trauring
ba06442125 Port to Python 3. 2021-02-22 10:14:21 -05:00
Itamar Turner-Trauring
c26d94b9b3 More type annotations. 2021-02-22 10:09:16 -05:00
Itamar Turner-Trauring
595ce94f2b Clarify filename parsing, hopefully. 2021-02-22 09:59:18 -05:00
Itamar Turner-Trauring
9fb0fc4734 Merge branch '3611.web-python-3-part-2' into 3617.web-python-3-part-4 2021-02-22 09:48:58 -05:00
Chad Whitacre
f6608255f9 Port control.py to Python 3 2021-02-20 12:14:14 -05:00
Itamar Turner-Trauring
041b72f0ab Fix lint. 2021-02-18 13:19:21 -05:00
Itamar Turner-Trauring
e9bf769798 Port to Python 3. 2021-02-18 11:56:53 -05:00
Itamar Turner-Trauring
cbb2cfc028 Port to Python 3. 2021-02-18 11:55:03 -05:00
Itamar Turner-Trauring
de0365a54b Port to Python 3. 2021-02-17 16:05:47 -05:00
Itamar Turner-Trauring
64490880d3 Port to Python 3. 2021-02-17 15:44:42 -05:00
Itamar Turner-Trauring
debda0d21a Merge branch '3611.web-python-3-part-2' into 3615.web-python-3-part-3 2021-02-17 15:37:51 -05:00
Chad Whitacre
5e52c03ef6
Merge pull request #983 from tahoe-lafs/3613.port-history 
Port history.py to Python 3
 2021-02-16 06:57:23 -05:00
Jason R. Coombs
939988a042 Add workaround for compatibility on Python 2 where test.cli.test_create_alias expects the URL to be a byte string, broken in d02334bfd5. 2021-02-15 15:13:56 -05:00
Jason R. Coombs
6118d1a2d2 Remove runner from ported modules. 2021-02-15 14:39:27 -05:00
Jason R. Coombs
d02334bfd5 Rely on futurize to expose the moved modules. 2021-02-15 14:13:59 -05:00
Jason R. Coombs
09f3e3f6b5 Remove comment, superseded by docstring. 2021-02-15 13:26:20 -05:00
Jason R. Coombs
0de90fda3f Merge commit '2fb603e60' into 3603.scripts 2021-02-15 13:10:35 -05:00
Jason R. Coombs
2fb603e603 Rewrite doctest to pass on Python 2+3. 2021-02-15 13:10:21 -05:00
Jason R. Coombs
ebbe645cb6 Use explicit unicode literal for docstring. Now test passes on Python 2 when ALLOW_BYTES is indicated. 2021-02-15 13:06:42 -05:00
Jason R. Coombs
4cb8c420d3 Manually reviewed test_runner (no legacy map, filter, or keys found). Added docstring to tag module as fully ported. 2021-02-15 12:49:20 -05:00
Jason R. Coombs
746e1b2664 Fix test failures on Python 2 by wrapping cli calls in unicode_to_argv. 2021-02-15 12:47:26 -05:00
Jason R. Coombs
d59d64d6bd Fully port test_runner. Introduces three new errors on Python 2. 2021-02-15 12:38:37 -05:00
Jason R. Coombs
3c93605ead Add docstring to types_. 2021-02-15 12:15:41 -05:00
Itamar Turner-Trauring
520e8fe55e Pacify typechecker. 2021-02-15 11:40:47 -05:00
Itamar Turner-Trauring
9bb64abded Flake fix. 2021-02-15 11:39:30 -05:00
Itamar Turner-Trauring
5b4428b968 Merge remote-tracking branch 'origin/master' into 3611.web-python-3-part-2 2021-02-15 11:38:30 -05:00
Itamar Turner-Trauring
06cd015647 Merge remote-tracking branch 'origin/master' into 3606.test_system-web-python3 2021-02-15 11:14:41 -05:00
Itamar Turner-Trauring
e41ff1a17d
Merge pull request #979 from tahoe-lafs/3607.web-python-3-part-1 
Port allmydata.web.common to Python 3

Fixes ticket:3607
 2021-02-15 11:13:34 -05:00
Jason R. Coombs
30f5c71a49 Encode expected message. Fixes remaining test failures in test_runner. 2021-02-15 09:36:07 -05:00
Jason R. Coombs
f183be9d6a Decode config file on read and expect bytes in the stdout. Fixes an additional test on Python 3. 2021-02-15 09:33:54 -05:00
Jason R. Coombs
3acad6544e Decode config file on read and expect bytes in the stdout. Fixes an additional test on Python 3. 2021-02-15 09:28:14 -05:00
Jason R. Coombs
dc883c0440 Decode config file on read. Fixes two test failures on Python 3. 2021-02-15 09:24:16 -05:00
Jason R. Coombs
eefb7004c9 Add test_runner to the ported test modules. Selectively decode sys.argv on Python 2 only. Fixes 6 test failures on Python 3. 2021-02-15 09:20:45 -05:00
Chad Whitacre
6db7b4a6c3 YOLO 2021-02-13 15:50:48 -05:00
Chad Whitacre
8700aae37a ¯\_(ツ)_/¯ 2021-02-13 15:48:42 -05:00
Jason R. Coombs
df137cca0a Merge branch 'master' into 3603.scripts 2021-02-12 16:08:31 -05:00
Jean-Paul Calderone
f0ac092109 Avoid the pidfile stuff on Windows 2021-02-12 14:49:20 -05:00
Jean-Paul Calderone
e9adccd432 more logs 2021-02-12 14:42:30 -05:00
Jean-Paul Calderone
47b60c0faa oh yea I think it's this 2021-02-12 14:39:28 -05:00
Jean-Paul Calderone
6458183df2 maybe it's this 2021-02-12 14:38:43 -05:00
Jean-Paul Calderone
50e033f263 Log unhandled output from the tahoe runner helper 2021-02-12 14:37:53 -05:00
Jean-Paul Calderone
4575deb27c Attempt to address non-ascii exceptions from the option parser 2021-02-12 14:32:49 -05:00
Jean-Paul Calderone
680a5a0575 mangling no longer a thing 2021-02-12 14:26:08 -05:00
Jean-Paul Calderone
91490fc2d5 Merge remote-tracking branch 'origin/master' into 3528.test_cli-no-mock 2021-02-12 13:35:03 -05:00
Jean-Paul Calderone
11e1fabbe4 Change the platform check to one mypy can recognize :/ 2021-02-12 13:10:31 -05:00
Jean-Paul Calderone
8ffb083d38 Merge remote-tracking branch 'origin/master' into 3581.unicode_to_argv.1 2021-02-12 13:08:51 -05:00
Itamar Turner-Trauring
42c4bac845 Fix test failure. 2021-02-12 12:01:43 -05:00
Itamar Turner-Trauring
c5a426b797 More unicode-of-bytes fixes. 2021-02-12 11:47:11 -05:00
Itamar Turner-Trauring
a06956632b More unicode-of-bytes bug fixes. 2021-02-12 11:37:43 -05:00
Itamar Turner-Trauring
5561f9fa16 Merge remote-tracking branch 'origin/master' into 3607.web-python-3-part-1 2021-02-12 11:22:34 -05:00
Itamar Turner-Trauring
681572b1a5 Merge remote-tracking branch 'origin/3606.test_system-web-python3' into 3611.web-python-3-part-2 2021-02-12 10:30:51 -05:00
Itamar Turner-Trauring
b935318d5d More unicode-of-bytes issues. 2021-02-12 10:27:41 -05:00
Jean-Paul Calderone
585c554081 Clarify _TwoLoggers 2021-02-12 10:22:17 -05:00
Jean-Paul Calderone
9a9b4bb232 Use a monkey patching library for monkey patching 2021-02-12 10:14:23 -05:00
Jean-Paul Calderone
ff25ee3f71 Merge remote-tracking branch 'origin/master' into 3600.eliotutil-vs-skips 2021-02-12 10:07:44 -05:00
Itamar Turner-Trauring
60da23abdb Fix another unicode-of-bytes issue. 2021-02-12 09:53:50 -05:00
Itamar Turner-Trauring
145d6b63ee Document trinary logic. 2021-02-12 09:48:33 -05:00
Itamar Turner-Trauring
85cdd281f1 Document trinary logic. 2021-02-12 09:47:48 -05:00
Jean-Paul Calderone
9ad4d31d9d
Merge pull request #968 from LeastAuthority/3592.convergence-hasher-tag-tests 
convergence hasher tag tests

Fixes: ticket:3592
 2021-02-11 16:25:41 -05:00
Jean-Paul Calderone
a8b1c204d2 Mark the expected result literal as the correct type, bytes 2021-02-11 16:06:18 -05:00
Jean-Paul Calderone
5568170c24 Slightly better docs for the share count limits on convergence hash tag 2021-02-11 15:46:04 -05:00
Itamar Turner-Trauring
9f1ca2ab6f More fixes for unicode-of-bytes bugs. 2021-02-11 13:28:09 -05:00
Itamar Turner-Trauring
eebeca31f5 Fix some more unicode()-of-bytestring bugs. 2021-02-11 13:11:34 -05:00
Itamar Turner-Trauring
05a85b0ce2 Fix some unicode(bytes_object) bugs. 2021-02-11 12:53:48 -05:00
Itamar Turner-Trauring
9190f323d3 Add some type annotations. 2021-02-11 10:08:44 -05:00
Itamar Turner-Trauring
d0d771e5be The bug in Autobahn was 
fixed (https://github.com/crossbario/autobahn-python/pull/1152) in March 2019, i.e.
before minimum required 19.5 version of Autobahn which came out in May 2019.
 2021-02-10 14:35:49 -05:00
Itamar Turner-Trauring
3abbe76d6a Merge branch '3607.web-python-3-part-1' into 3611.web-python-3-part-2 2021-02-10 14:33:00 -05:00
Itamar Turner-Trauring
166c1a537e Fix Python 3 failure. 2021-02-10 14:26:23 -05:00
Itamar Turner-Trauring
3fd90640f3 Merge remote-tracking branch 'origin/master' into 3606.test_system-web-python3 2021-02-10 14:23:53 -05:00
Itamar Turner-Trauring
e5806301d3
Merge pull request #976 from tahoe-lafs/3596.test-web-python-3-even-more 
Port test_web.py to Python 3

Fixes ticket:3596
 2021-02-10 14:21:22 -05:00
Itamar Turner-Trauring
d237dcab15 Restore test coverage. 2021-02-10 14:06:42 -05:00
Itamar Turner-Trauring
66160253e3 Not necessary to be bytes. 2021-02-10 13:35:04 -05:00
Jean-Paul Calderone
9b2a9e14ae Re-add the check so we still get early failure if this ever happens 2021-02-09 21:21:31 -05:00
Jean-Paul Calderone
3beacc9c8f Merge remote-tracking branch 'origin/master' into 3581.unicode_to_argv.1 2021-02-09 21:18:58 -05:00
Jean-Paul Calderone
845e33061e
Merge pull request #964 from LeastAuthority/3588.use-pywin32-more 
Use pywin32 more

Fixes: ticket:3588
 2021-02-09 21:15:34 -05:00
Jean-Paul Calderone
28acc5ccb4 Duplicate the fix for the other Windows-only module 2021-02-09 14:50:29 -05:00
Jean-Paul Calderone
b26652cad1 Try to get Mypy to recognize it this way? 2021-02-09 14:36:19 -05:00
Jean-Paul Calderone
27fcfe94dd The code is 3-clause BSD licensed now. 2021-02-09 10:24:46 -05:00
Jean-Paul Calderone
541d7043d7 Some comments about unicode handling in this UnicodeOutput thing 2021-02-09 10:20:14 -05:00
Jean-Paul Calderone
ddcb43561d Try to convince Mypy it's okay 2021-02-08 19:49:02 -05:00
Jean-Paul Calderone
ab57746a85
Merge pull request #969 from LeastAuthority/3593.get_encryption_key-test 
Add FileHandle.get_encryption_key test

Fixes: ticket:3593
 2021-02-07 07:41:44 -05:00
Itamar Turner-Trauring
92f5001596 Port to Python 3. 2021-02-04 14:10:22 -05:00
Itamar Turner-Trauring
c44b46e0a6 More type annotation. 2021-02-04 11:44:26 -05:00
Itamar Turner-Trauring
8fdbb6db6e Nail down types. 2021-02-04 11:22:48 -05:00
Itamar Turner-Trauring
dfffa8722a Get rid of allmydata.web.common_py3. 2021-02-03 11:45:30 -05:00
Itamar Turner-Trauring
6b38c8d1c9 More of test_system now passes on Python 3. 2021-02-03 11:24:47 -05:00
Itamar Turner-Trauring
cb99b27b78 Nothing to see here, move along. 2021-02-03 10:21:41 -05:00
Itamar Turner-Trauring
2595e25258 Improve coverage, specifically of values that are bytes. 2021-02-03 10:16:34 -05:00
Itamar Turner-Trauring
a1add9a512 Clarify. 2021-02-03 10:13:19 -05:00
Itamar Turner-Trauring
c26f28584e Clarify what it does. 2021-02-03 10:11:30 -05:00
Itamar Turner-Trauring
0b57fb9df1 Merge remote-tracking branch 'origin/master' into 3596.test-web-python-3-even-more 2021-02-02 15:28:49 -05:00
Itamar Turner-Trauring
51bd4b719c Fix lint. 2021-02-02 15:28:12 -05:00
Itamar Turner-Trauring
fa3bef5b25 Port to Python 3. 2021-02-02 15:27:15 -05:00
Itamar Turner-Trauring
489b9f87b3 All tests pass on Python 3. 2021-02-02 15:14:44 -05:00
Itamar Turner-Trauring
26560a4212 More passing tests on Python 3. 2021-02-02 14:25:01 -05:00
Itamar Turner-Trauring
abf6413a89 More passing tests on Python 3. 2021-02-01 11:50:33 -05:00
Itamar Turner-Trauring
a27dc83920 More passing tests on Python 3. 2021-02-01 11:42:09 -05:00
Itamar Turner-Trauring
73537351a7 More passing tests on Python 3. 2021-02-01 11:05:36 -05:00
Itamar Turner-Trauring
438933ec8d Fix tests on Python 2. 2021-02-01 11:02:00 -05:00
Itamar Turner-Trauring
20c04f4ddb Make sure it's non-UTF-8-encodable bytes, just to make sure it's roundtripping correctly. 2021-02-01 10:46:08 -05:00
Itamar Turner-Trauring
be59682532 Fix issue with file uploads being Unicode on Python 3. 2021-02-01 10:44:14 -05:00
Jason R. Coombs
621ae58abe Avoid overthinking encoding when handling usage errors. 'test_unicode_arguments_and_output' still passes on Python 2. Ref #3603. 2021-01-31 11:13:59 -05:00
Jason R. Coombs
57cb88638a In scripts.create_node, set the encoding once and write text. 2021-01-30 12:46:44 -05:00
Jason R. Coombs
d6082d853a Declare scripts.create_node as ported. 2021-01-30 12:23:16 -05:00
Jason R. Coombs
36b7fdaecf Apply futurize to create_node. 2021-01-30 12:15:36 -05:00
Jason R. Coombs
5fc9674d3a Update escape_path for Python 3 compatibility. 2021-01-30 11:47:53 -05:00
Jason R. Coombs
210eb5b529 Add test for escape_path. 2021-01-30 11:44:36 -05:00
Jason R. Coombs
2bd244dde9 Declare scripts.runner as ported. Ref #3603. 2021-01-30 11:24:06 -05:00
Jason R. Coombs
5bf2b09b81 In scripts.runner, replace hard failure on Python 3 with 'experimental' warning. Ref #3603. Closes #3035. 2021-01-30 11:12:01 -05:00
Jason R. Coombs
00e856fed5 Declare scripts.types_ as ported (never had Python 2 support). 2021-01-30 11:00:19 -05:00
Itamar Turner-Trauring
943eabab28 Pacify flake8. 2021-01-29 10:02:16 -05:00
Itamar Turner-Trauring
6fd62eb25e Merge remote-tracking branch 'origin/master' into 3579.ftp-python-3 2021-01-28 15:15:57 -05:00
Jean-Paul Calderone
81edda8011 ... this? 2021-01-28 15:11:13 -05:00
Itamar Turner-Trauring
d1be6b4bde Prepare for merge. 2021-01-28 15:10:57 -05:00
Itamar Turner-Trauring
90a47bb859 WIP 2021-01-28 12:00:15 -05:00
Itamar Turner-Trauring
e5a7ea97c7 More tests passing on Python 3. 2021-01-28 11:44:16 -05:00
Itamar Turner-Trauring
2007323baa More passing tests on Python 3. 2021-01-28 11:19:09 -05:00
Itamar Turner-Trauring
6668842356 More passing tests on Python 3. 2021-01-27 15:43:44 -05:00
Itamar Turner-Trauring
ea10c7c937 More passing tests on Python 3. 2021-01-27 15:20:38 -05:00
Itamar Turner-Trauring
175a3ca4bb More passing tests on Python 3. 2021-01-27 12:45:36 -05:00
Itamar Turner-Trauring
4f56ce436a More passing tests on Python 3. 2021-01-27 12:39:28 -05:00
Itamar Turner-Trauring
c1391159fa More passing tests on Python 3. 2021-01-27 12:06:25 -05:00
Jean-Paul Calderone
64f3e1277e Replace eliot_logged_test with something ... else 
The previous implementation relied on TestCase.addCleanup in an unreliable
way.

This implementation pushes the decoration logic in to the test method itself
on the premise that test methods that do weird stuff are better supported than
`run` methods that do weird stuff.

Also add some more tests for this behavior.
 2021-01-27 11:33:09 -05:00
Itamar Turner-Trauring
9f5e1381bf Another passing Python 3 test. 2021-01-27 11:29:46 -05:00
Itamar Turner-Trauring
5a2339ced3 Another test passing on Python 3. 2021-01-26 11:09:19 -05:00
Itamar Turner-Trauring
8493d70cab Support byte keys in internal dictionaries. 2021-01-26 11:01:50 -05:00
Itamar Turner-Trauring
e271cd1b64 Another test passing on Python 3. 2021-01-26 10:20:15 -05:00
Jean-Paul Calderone
bb8348f7bb Merge remote-tracking branch 'origin/master' into 3588.use-pywin32-more 2021-01-26 09:54:59 -05:00
Itamar Turner-Trauring
49300ccc4e Merge remote-tracking branch 'origin/master' into 3584.integration-tests-sftp 2021-01-26 09:53:51 -05:00
Jean-Paul Calderone
15dbbce217 Merge remote-tracking branch 'origin/master' into 3592.convergence-hasher-tag-tests 2021-01-26 09:53:26 -05:00
Itamar Turner-Trauring
dc3871b711
Merge pull request #970 from tahoe-lafs/3590.error-in-integration-test 
Fix URI redirect error that was manifesting in the integration tests

Fixes ticket:3590
 2021-01-26 09:50:40 -05:00
Jean-Paul Calderone
25b453047c Merge remote-tracking branch 'origin/master' into 3593.get_encryption_key-test 2021-01-25 11:12:59 -05:00
Itamar Turner-Trauring
58745fd373 More passing Python 3 tests. 2021-01-25 10:32:28 -05:00
Itamar Turner-Trauring
59847edf9c More Python 3 fixes. 2021-01-25 10:06:05 -05:00
Itamar Turner-Trauring
b6788c4439 More Python 3 fixes. 2021-01-25 09:55:55 -05:00
Itamar Turner-Trauring
3eb62f1d0f More passing tests on Python 3. 2021-01-25 09:25:20 -05:00
Jean-Paul Calderone
e5f0dcfbb4
Merge pull request #971 from LeastAuthority/3594.read_encrypted-test 
Directly test read_encrypted behavior and remove a `fireEventually` from its implementation

Fixes: ticket:3594
Fixes: ticket:3595
 2021-01-25 09:14:35 -05:00
Jean-Paul Calderone
e0fa228622 expand partial/lambda into full functions for clarity 2021-01-25 08:23:40 -05:00
Jean-Paul Calderone
5a0c913f58 document the new parameter 2021-01-25 08:21:39 -05:00