Fold common_py3 back into common #3456

New Issue

chadwhitacre · 2020-10-01T01:45:36Z

chadwhitacre commented

2020-10-01 01:45:36 +00:00

Pursuant to https://github.com/tahoe-lafs/tahoe-lafs/pull/823/files#r494347203 ff.

Pursuant to <https://github.com/tahoe-lafs/tahoe-lafs/pull/823/files#r494347203> ff.

chadwhitacre added the

labels 2020-10-01 01:45:36 +00:00

chadwhitacre added this to the Support Python 3 milestone 2020-10-01 01:45:36 +00:00

chadwhitacre self-assigned this 2020-10-01 01:46:19 +00:00

chadwhitacre commented

2020-10-01 02:13:18 +00:00

Reviewing the history of common_py3.py, here is a list of commits to undo:

[LoggingServiceParent, ShouldFailMixin](a758f32edf) (common)
[Marker, FakeCanary](416ab64335)
ReallyEqualMixin, skip_if_cannot_represent_filename
ShouldFailMixin (common_util, cf.)
SignalMixin
TimezoneMixin

This isn't simply a revert, however, since the classes have changed since being moved into common_py3. It's the current version of each class that we want to move back. Also, they came from different sources (common, common_util, etc.) and I plan to move them each back where they came from—so this isn't a simple copy/paste into common.py.

Reviewing the [history](https://github.com/tahoe-lafs/tahoe-lafs/commits/e981fea00790765af81422d1c02dba0cfd4295e1/src/allmydata/test/common_py3.py) of common_py3.py, here is a list of commits to undo: 1. [LoggingServiceParent, [ShouldFailMixin](wiki/ShouldFailMixin)](https://github.com/tahoe-lafs/tahoe-lafs/commit/a758f32edfd816ca4d56e797767fdaa4312f5bb1) (common) 1. [Marker, [FakeCanary](wiki/FakeCanary)](https://github.com/tahoe-lafs/tahoe-lafs/commit/416ab643359c10e80f9ef0b18e8e4d173757bde5) 1. [ReallyEqualMixin, skip_if_cannot_represent_filename](https://github.com/tahoe-lafs/tahoe-lafs/commit/e13c0cf4d34dacf00b51c0d788fd859197467ac2) 1. [ShouldFailMixin](https://github.com/tahoe-lafs/tahoe-lafs/commit/44143d1b083acf23b93bbfb5eb37a23e9af22934) (common_util, [cf.](https://github.com/tahoe-lafs/tahoe-lafs/commit/d195ae43232b654371d1f3d476fc0b7bde640be9)) 1. [SignalMixin](https://github.com/tahoe-lafs/tahoe-lafs/commit/bf134019797b2fadc8f92405720b1956e4b2fbc5) 1. [TimezoneMixin](https://github.com/tahoe-lafs/tahoe-lafs/commit/51e9c2183cf15268985412481b01112f8b2a5b77) This isn't simply a revert, however, since the classes have changed since being moved into common_py3. It's the current version of each class that we want to move back. Also, they came from different sources (common, common_util, etc.) and I plan to move them each back where they came from—so this isn't a simple copy/paste into common.py.