[PATCH] a couple of python patches

[Douglas Bagnall]

These are a couple of patches derived from my "one hundred python
patches" set that I warned about recently:

> Re: One hundred python patches
> On 12/10/2018 07:04, Alexander Bokovoy via samba-technical wrote:
>> On pe, 12 loka 2018, Douglas Bagnall via samba-technical wrote:
>>> I have about 100 patches to python files here:
>>>
>>> https://gitlab.com/samba-team/devel/samba/commits/pyflake3-fixes
>>>
>>> They are WIP. Most of them are probably correct, though collectively
>>> they don't like to pass CI.
>> Thanks for this effort, Douglas.
>>
>> May be you can submit them in groups that are smaller and pass the
>> tests? They aren't dependent on each other in most cases.
>>
> yep, please do these in bite sized portions if only to save my sanity (another large patchset brewing here..... https://gitlab.com/samba-team/devel/samba/commits/npower-pure-py3build) This one currently passes all (*manually*, note: *no* CI job yet) 

Noel's patches are in, and these two fall out of the merge conflicts.

The first one tries to maintain the original intention of the Python 2
test, and the second removes a file of historical interest only.

CI: https://gitlab.com/samba-team/devel/samba/pipelines/34091930

More subsets of the hundred will be forthcoming.

cheers,
Douglas