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

[BEAM-1251] Use six.integer_types #4571

Merged
merged 1 commit into from
Feb 14, 2018

Conversation

cclauss
Copy link

@cclauss cclauss commented Feb 1, 2018

http://six.readthedocs.io/#six.integer_types

long was dropped from Python 3 so in the PR we replace all copies of isinstance(x, (int, long)) with isinstance(x, integer_types) which will do the right thing on both Python 2 and Python 3.

@cclauss
Copy link
Author

cclauss commented Feb 1, 2018

@robertwb I have a hard time making sense of the Jenkins output. What have I done wrong here?

@robertwb
Copy link
Contributor

robertwb commented Feb 1, 2018 via email

@robertwb
Copy link
Contributor

robertwb commented Feb 5, 2018

Were you able to figure this out?

@cclauss cclauss force-pushed the from-six-import-integer_types branch from 9e4f27b to 570cfaa Compare February 6, 2018 09:51
@cclauss
Copy link
Author

cclauss commented Feb 6, 2018

It was... Running pylint for module apache_beam:
************* Module apache_beam.io.range_trackers_test
C:104, 0: Line too long (81/80) (line-too-long)

@cclauss cclauss force-pushed the from-six-import-integer_types branch from 570cfaa to 0b0c85f Compare February 6, 2018 10:13
@cclauss cclauss force-pushed the from-six-import-integer_types branch from 0b0c85f to e6e875d Compare February 6, 2018 10:14
@jkff jkff requested a review from robertwb February 7, 2018 22:13
@robertwb
Copy link
Contributor

robertwb commented Feb 7, 2018

Jenkins: retest this please.

@robertwb robertwb changed the title from six import integer_types (en masse) [BEAM-1251] Use six.integer_types Feb 14, 2018
@robertwb
Copy link
Contributor

LGTM

@robertwb robertwb merged commit 814a80a into apache:master Feb 14, 2018
@cclauss cclauss deleted the from-six-import-integer_types branch February 14, 2018 00:03
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

2 participants