conform to pep 3110 #2064

Carreau · 2012-06-30T16:43:59Z

brutally replace all exeption <type>, <name>: by
exception <type> as <name> :

exception <type>, <type> : should not be present anywhere in the code
anymore, or should be present with explicit tuple as
exception (<type>, <type>) :

see also #2061

brutally replace all `exeption <type>, <name>:` by `exception <type> as <name> :` `exception <type>, <type> :` should not be present anywhere in the code anymore, or should be present with explicit tuple as `exception (<type>, <type>)`

fperez · 2012-06-30T16:47:22Z

I think these are all good, but let's run a test_pr just to be safe...

Carreau · 2012-07-01T07:59:34Z

Test results for commit 28b538a merged into master
Platform: darwin

python2.6: OK
python2.7: OK (libraries not available: cython oct2py pymongo rpy2 wx wx.aui)

Not available for testing: python3.1, python3.2

Carreau · 2012-07-01T16:13:53Z

This make me think, there is a lot a "fixes" that 2to3 can apply independently to the all source tree and that will still be python2.x compatible.

Do we want to start applying them to have a smoother transition to a fully dirrectly python3 compatible version of IPython ?

I think the hardest part will be the u'strings' that are invalid python 3.1/3.2 but will be understood in python 3.3.

[edit :]
see https://github.com/Carreau/ipython/compare/2to3compat

2to3 makes a better job than regexp

fperez · 2012-07-01T20:08:21Z

On Sun, Jul 1, 2012 at 9:13 AM, Bussonnier Matthias
reply@reply.github.com
wrote:

Do we want to start applying them to have a smoother transition to a fully dirrectly python3 compatible version of IPython ?

In principle I agree with you, but I'd like to hear @takluyver's
opinion on this, since he actually uses py3 daily (I don't) and he's
sort of our py3 overlord.

takluyver · 2012-07-03T20:39:05Z

I like this approach - I find except Exception as e much more readable than the old style. We could also skip the relevant 2to3 fixer during installation (they can be disabled individually, as seen here).

I've also been meaning to find all the files which use the ugly print >>foo syntax, and sprinkle some __future__ on them.

Carreau · 2012-07-03T20:46:29Z

let's see this one as a first step.
I'll add a commit that disable exceptions in 2to3 and make another PR with what i've done so far tomorrow.

takluyver · 2012-07-03T20:51:24Z

It looks like it's called except - the list is here.

this should allow a more compatible codebase between python 2.x and 3.x

Carreau · 2012-07-04T06:43:51Z

skip except in setup.py for python3.
My python 3.2 keep trying to import nose from 2.7 site-package, so test_pr fail to test for python 3.x so if SO can run test_pr for my on python 3...

Carreau · 2012-07-04T06:47:39Z

Test results for commit 1c49f84 merged into master
Platform: darwin

python2.6: OK
python2.7: OK (libraries not available: cython oct2py pymongo rpy2 wx wx.aui)

Not available for testing: python3.1, python3.2

takluyver · 2012-07-04T11:00:56Z

setup.py

@@ -234,6 +234,12 @@ def cleanup():

    if PY3:
        setuptools_extra_args['use_2to3'] = True
+        # we try to make a 2.6, 2.7, and 3.1 to 3.3 python compatible code
+        # so we explicitely disable some 2to3 fixes to be sure we ain't forgetting


'explicitly'. Also, "ain't" is colloquial - we should use "aren't", so that it's clear to people who're less familiar with English.

takluyver · 2012-07-04T11:04:22Z

Test results for commit 1c49f84 merged into master
Platform: linux2

python2.7: OK (libraries not available: oct2py pymongo tornado wx wx.aui)
python3.2: OK (libraries not available: oct2py pymongo wx wx.aui)

Not available for testing: python2.6, python3.1

Carreau · 2012-07-04T11:25:16Z

fixed,
As a side note, I skipped IPython/deathrow and IPython/quarantine on purpose.

takluyver · 2012-07-04T11:46:05Z

Thanks. Skipping deathrow and quarantine should be fine, as they don't get installed. If anyone updates those, we'll need to check they use the new style - but test_pr should pick that up.

The only other thing to consider is that we're changing external modules, especially pexpect, so we can send the changes upstream (although they might be rejected by projects which still want to support Python < 2.6).

Carreau · 2012-07-04T12:07:46Z

Hum, checking again it seems like I did apply 2to3 fo deathrow and quarantine, a * might have slips through... I won't do it for the next changes.

pexpect seem to be dead for 3 years now...

takluyver · 2012-07-04T12:16:13Z

I know, I had to fork it: http://pypi.python.org/pypi/pexpect-u

It looks like SSH is just an adapted example, not a real upstream package, so I think we're all OK.

takluyver · 2012-07-04T20:23:40Z

Just rerunning the tests. @minrk , any objections to merging this one? It doesn't introduce any ugliness, and I think the new syntax is clearer.

takluyver · 2012-07-04T20:30:25Z

Test results for commit 3f213ee merged into master
Platform: linux2

python2.7: OK (libraries not available: oct2py rpy2)
python3.1: OK (libraries not available: cython matplotlib numpy oct2py pymongo qt rpy2 wx wx.aui zmq)
python3.2: OK (libraries not available: cython oct2py pymongo rpy2 wx wx.aui)

Not available for testing: python2.6

minrk · 2012-07-04T20:39:27Z

No objection from me.

Use new style "except Exception as e" syntax.

takluyver · 2012-07-04T20:51:04Z

Great, I've merged this.

fperez · 2012-07-04T21:22:27Z

On Wed, Jul 4, 2012 at 1:51 PM, Thomas Kluyver
reply@reply.github.com
wrote:

Great, I've merged this.

Reply to this email directly or view it on GitHub:
#2064 (comment)

+1

Use new style "except Exception as e" syntax.

conform to pep 3110

28b538a

brutally replace all `exeption <type>, <name>:` by `exception <type> as <name> :` `exception <type>, <type> :` should not be present anywhere in the code anymore, or should be present with explicit tuple as `exception (<type>, <type>)`

fix more exeptions

90c0a4e

2to3 makes a better job than regexp

disable some specific 2to3 fixes whith setup.py

1c49f84

this should allow a more compatible codebase between python 2.x and 3.x

takluyver reviewed Jul 4, 2012
View reviewed changes

fix english in comment

3f213ee

Carreau mentioned this pull request Jul 4, 2012

[in progress] python 2 and 3 compatibility without 2to3 #2095

Closed

takluyver added a commit that referenced this pull request Jul 4, 2012

Merge pull request #2064 from Carreau/pep-3110

dceb676

Use new style "except Exception as e" syntax.

takluyver merged commit dceb676 into ipython:master Jul 4, 2012

bfroehle mentioned this pull request Sep 27, 2012

IPEP 4: Python 3 Compatibility #2440

Closed

mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014

Merge pull request ipython#2064 from Carreau/pep-3110

8ffda55

Use new style "except Exception as e" syntax.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

conform to pep 3110 #2064

conform to pep 3110 #2064

Carreau commented Jun 30, 2012

fperez commented Jun 30, 2012

Carreau commented Jul 1, 2012

Carreau commented Jul 1, 2012

fperez commented Jul 1, 2012

takluyver commented Jul 3, 2012

Carreau commented Jul 3, 2012

takluyver commented Jul 3, 2012

Carreau commented Jul 4, 2012

Carreau commented Jul 4, 2012

takluyver Jul 4, 2012

takluyver commented Jul 4, 2012

Carreau commented Jul 4, 2012

takluyver commented Jul 4, 2012

Carreau commented Jul 4, 2012

takluyver commented Jul 4, 2012

takluyver commented Jul 4, 2012

takluyver commented Jul 4, 2012

minrk commented Jul 4, 2012

takluyver commented Jul 4, 2012

fperez commented Jul 4, 2012

conform to pep 3110 #2064

conform to pep 3110 #2064

Conversation

Carreau commented Jun 30, 2012

fperez commented Jun 30, 2012

Carreau commented Jul 1, 2012

Carreau commented Jul 1, 2012

fperez commented Jul 1, 2012

takluyver commented Jul 3, 2012

Carreau commented Jul 3, 2012

takluyver commented Jul 3, 2012

Carreau commented Jul 4, 2012

Carreau commented Jul 4, 2012

takluyver Jul 4, 2012

Choose a reason for hiding this comment

takluyver commented Jul 4, 2012

Carreau commented Jul 4, 2012

takluyver commented Jul 4, 2012

Carreau commented Jul 4, 2012

takluyver commented Jul 4, 2012

takluyver commented Jul 4, 2012

takluyver commented Jul 4, 2012

minrk commented Jul 4, 2012

takluyver commented Jul 4, 2012

fperez commented Jul 4, 2012