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.

Sign up for GitHub

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

Jump to bottom

Python 3 - pathod.language.actions #1181

Merged
merged 5 commits into from
Jun 5, 2016
Merged

Python 3 - pathod.language.actions #1181

merged 5 commits into from
Jun 5, 2016

Conversation

dufferzafar
Copy link
Contributor

No description provided.

mhils
mhils reviewed May 31, 2016
View reviewed changes
pathod/language/actions.py
return self.offset < other.offset

def __eq__(self, other):
return self.offset == other.offset
Copy link
Member

Choose a reason for hiding this comment

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

Add @functools.total_ordering here?

@Kriechi
Copy link
Member

Kriechi commented Jun 1, 2016

@dufferzafar seems a few tests are still failing:

For example: test/pathod/test_language_actions.py:65
The test calls: language.parse_pathod("400:i0,'foo'")
but parse_pathod calls decode("ascii") on the input string. So we need to change the data type here again.
I think the other test failures are related to this.

@dufferzafar
Copy link
Contributor Author

Sorry, but I failed to mention that this pull should be merged AFTER #1170 gets merged as I have fixed that particular issue here.

@dufferzafar
Copy link
Contributor Author

Stalled because one of the tests is failing, and it depends on proper porting of pathod.langauge.base

@dufferzafar dufferzafar force-pushed the pathod-lang-actions branch 2 times, most recently from 03f113a to ff0b3fd Compare June 4, 2016 10:59
@dufferzafar
Copy link
Contributor Author

Waiting for #1210

@dufferzafar
Copy link
Contributor Author

I think this pull can be merged as nothing more needs to be done here. A test fails currently, but it'll pass once #1210 gets merged (I've ran the tests with the branch merged locally.)

@Kriechi
Copy link
Member

Kriechi commented Jun 5, 2016

Could you please rebase to resolve the conflicts?

@dufferzafar
Copy link
Contributor Author

Done!

@dufferzafar
Copy link
Contributor Author

I've removed Travis / Tox stuff!

@mhils mhils merged commit 435bfec into mitmproxy:master Jun 5, 2016
@dufferzafar dufferzafar deleted the pathod-lang-actions branch June 7, 2016 06:34
@dufferzafar dufferzafar modified the milestone: python-3 Jul 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
python-3
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dufferzafar @Kriechi @mhils