Remove Python 2.5 compatibility

[Ryan J Ollos]

If the changes proposed in #11581 are committed, we will start enforcing the Python 2.6 requirement on the trunk (see TracDev/ApiChanges/1.1.1). Therefore the from __future__ import with_statement lines can be removed from the codebase.

See ​https://docs.python.org/2/whatsnew/2.6.html

[Ryan J Ollos]

Committed to trunk in [12751].

[Jun Omae]

json library has been added as a standard module since 2.6. We could remove except ImportError block for from json ... in tags/trac-1.1.1/trac/util/presentation.py@:306#L293​.

[Ryan J Ollos]

Okay, I'll go ahead and make that change as well.

There's also a comment in pygments​, which implies the import might be handled differently in Python 2.5 and later.

I don't seem to be receiving email notifications for this ticket.

[Ryan J Ollos]

Change suggested in comment:2 committed in [12758].

[Jun Omae]

Other things:

• tags/trac-1.1.1/trac/util/__init__.py​: We could replace body of terminate() function with process.terminate(). Process.terminate() function is available since 2.6.
• tags/trac-1.1.1/trac/util/compat.py​: We could remove compatibility function for cleandoc on Python 2.5.

[Ryan J Ollos]

Replying to jomae:

Other things:

• tags/trac-1.1.1/trac/util/__init__.py​: We could replace body of terminate() function with process.terminate(). Process.terminate() function is available since 2.6.

The comment mentions some possible issues on Windows: branches/1.0-stable/trac/util/__init__.py@12083:370#L366​.

There's also a use of terminate where the pid is attached to an object that's not a subprocess.Popen object: branches/1.0-stable/trac/tests/functional/testenv.py@12528:286#L280​.

I've prepared some changes in log:rjollos.git:t11600.2.

[Jun Omae]

Replying to rjollos:

There's also a use of terminate where the pid is attached to an object that's not a subprocess.Popen object: branches/1.0-stable/trac/tests/functional/testenv.py@12528:286#L280​.

Oh, you're right. I didn't intend non-Popen instance is passed to terminate(). We leave it.

[Ryan J Ollos]

Replying to rjollos:

There's also a comment in pygments​, which implies the import might be handled differently in Python 2.5 and later.

It looks like absolute imports can be enforced in Python 2.5 and later using a ​module from __future__. This is described in the ​Python 2.5 release notes.

I wonder if we could use this feature to avoid problems like the one in #11248, and the test failure in comment:4:ticket:11284. I'll save that for another day though.

[Ryan J Ollos]

I added a few more changes to log:rjollos.git:t11600.2, to adjust to the additional use case of terminate. Please let me know if you have any comments.

[Jun Omae]

In [78c15189/rjollos.git], we could remove process argument from terminate_win(process) and terminate_nix(process).

[anonymous]

Thanks, committed to trunk in [12764:12765].