Opened 9 years ago

Closed 9 years ago

#6235 task closed fixed (fixed)

Merge `twisted/python/` into `twisted/python/`

Reported by: Jean-Paul Calderone Owned by: Jean-Paul Calderone
Priority: normal Milestone:
Component: core Keywords:
Cc: Branch: branches/util-merge-6235
branch-diff, diff-cov, branch-cov, buildbot
Author: exarkun


Also merge the associated test module. See #6183.

Change History (5)

comment:1 Changed 9 years ago by Jean-Paul Calderone

Author: exarkun
Branch: branches/util-merge-6235

(In [36657]) Branching to 'util-merge-6235'

comment:2 Changed 9 years ago by Jean-Paul Calderone

Keywords: review added
Owner: Jean-Paul Calderone deleted

It's done. I tried to provide good descriptions of the steps and the logic behind them in each commit message. The result is not as nice as I thought it would be, with respect to change history. I'm now convinced it's not feasible to restore any more of the history than this branch does (which is to say, any of the history of the moved code); perhaps svnadmin could do it, I don't know, but I don't think I'll try to go down that road.

The code moved into and is all copied verbatim from and except that I had to change TestCase to unittest.TestCase for the class statements being moved into

It may be instructive to consider the diff 36657:36669 separately from r36670 and r36671. The former is "move stuff around without interestingly changing it" (r36668 not withstanding). The remainder is "adjust syntax and obliterate unported names" necessary to make the merged modules actually work on Python 3 (only to the level of functionality previously present in _utilpy3).

Build results

comment:3 Changed 9 years ago by Tom Prince

Owner: set to Tom Prince

comment:4 Changed 9 years ago by Tom Prince

Keywords: review removed
Owner: changed from Tom Prince to Jean-Paul Calderone
  1. This is missing imports from __future__.
  2. GetPasswordTest but isn't deleted and is skipped due to lack of process support on the reactor. It should be deleted.
  3. InitGroupsTests) wasn't ported but is passing. It should be deleted or the appropriate functionality marked as supported. Looking closer, it appears that this isn't intended to be public anyway. (This can be done in a separate ticket).

Please commit after fixing 1+2 (and possibly 3).

(Note for archaeologists: there is no interesting history on trunk in and that is lost. There is one non-py3 related changeset in r35964 closing #6063).

comment:5 Changed 9 years ago by Jean-Paul Calderone

Resolution: fixed
Status: newclosed

(In [36719]) Merge util-merge-6235

Author: exarkun Reviewer: tom.prince Fixes: #6235

Re-integrate the Python 3 ported miscellaneous util implementations into twisted/python/

Note: See TracTickets for help on using tickets.