Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2to3 compat ] Tuple params in func defs #2158

Merged
merged 2 commits into from Jul 18, 2012
Merged

Conversation

Carreau
Copy link
Member

@Carreau Carreau commented Jul 18, 2012

See pep 3113.

@@ -204,10 +204,10 @@ def format2(self, raw, out = None, scheme = ''):
return (output, error)
return (None, error)

def __call__(self, toktype, toktext, (srow,scol), (erow,ecol), line):
def __call__(self, toktype, toktext, s_tuple, e_tuple, line):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we come up with a better name? I haven't read the function, but my first guess would be start and end? Or spos, epos? Or..

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed to (start | end)_pos squashed and force pushed.

@bfroehle
Copy link
Contributor

Okay looks good to me. 2to3 doesn't report any other instances of this tuple parameter construction.

@takluyver
Copy link
Member

Test results for commit 82a4930 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

@takluyver
Copy link
Member

Looks good to me. Merge at your leisure.

@Carreau
Copy link
Member Author

Carreau commented Jul 18, 2012

Sorry, i' don't have the habit of using test_pr as requests fail at work... I should find a way around...
Merging.
Thanks.

Carreau added a commit that referenced this pull request Jul 18, 2012
Remove tuple auto unpack in function definition 

This is for 2to3 compatibility., and also deactivate the application of 
the corresponding 2to3 fix when using python3 and setup.py.
@Carreau Carreau merged commit 072f555 into ipython:master Jul 18, 2012
@takluyver
Copy link
Member

That's OK, it's designed so anyone can easily run it, so it doesn't have to be the author.

Is it a proxy that's causing the problem? I remember the pain of being forced to access the net through a proxy, but happily I no longer need to.

@Carreau
Copy link
Member Author

Carreau commented Jul 18, 2012

Yes, dumb proxy, open only on 80 et 443 .... that's also what prevent me from using git mpr...

@takluyver
Copy link
Member

Shouldn't 80 & 443 cover what you need here? Or is requests ignoring
the proxy settings? @kennethreitz is quite quick to respond, if it's
something that can be fixed in requests.

@Carreau
Copy link
Member Author

Carreau commented Jul 18, 2012

Yes i've an opened issue , but hasn't been fixed yet.
Not event sure where this came from.

I would guess this is bad proxy config from the IT guys where I work. It took them 3 month to understand what rsync was and to accept to open a port that was close a week later...

mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
Remove tuple auto unpack in function definition 

This is for 2to3 compatibility., and also deactivate the application of 
the corresponding 2to3 fix when using python3 and setup.py.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants