This repository has been archived by the owner on Jul 31, 2020. It is now read-only.
2to3 python conversion with major version bump to 1.0.0-yr.alpha #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chuckg
approved these changes
Nov 4, 2016
| @@ -86,7 +87,7 @@ def method_fields(self, handler, fields): | |||
| for field in fields - Emitter.RESERVED_FIELDS: | |||
| t = getattr(handler, str(field), None) | |||
|
|
|||
| if t and callable(t): | |||
| if t and isinstance(t, collections.Callable): | |||
There was a problem hiding this comment.
The original code should still work here in 3.5; they re-added callable in 3.2
| @@ -30,8 +31,8 @@ class Resource(object): | |||
| 'PUT': 'update', 'DELETE': 'delete' } | |||
|
|
|||
| def __init__(self, handler, authentication=None): | |||
| if not callable(handler): | |||
| raise AttributeError, "Handler not callable." | |||
| if not isinstance(handler, collections.Callable): | |||
There was a problem hiding this comment.
Don't think this works; this isn't a collection.
| @@ -86,10 +87,10 @@ def anonymous(self): | |||
| if hasattr(self.handler, 'anonymous'): | |||
| anon = self.handler.anonymous | |||
|
|
|||
| if callable(anon): | |||
| if isinstance(anon, collections.Callable): | |||
| @@ -140,16 +140,16 @@ def test(): | |||
| >>> is_valid_javascript_identifier('$210') | |||
| True | |||
|
|
|||
| >>> is_valid_javascript_identifier(u'Stra\u00dfe') | |||
| >>> is_valid_javascript_identifier(u'Stra\\u00dfe') | |||
There was a problem hiding this comment.
Didn't update the comments correctly here, re: u'string' unicode string classifier.
| @@ -221,7 +222,7 @@ def _model(data, fields=()): | |||
| if inst: | |||
| if hasattr(inst, 'all'): | |||
| ret[model] = _related(inst, fields) | |||
| elif callable(inst): | |||
| elif isinstance(inst, collections.Callable): | |||
| @@ -236,7 +237,7 @@ def _model(data, fields=()): | |||
| else: | |||
| maybe = getattr(data, maybe_field, None) | |||
| if maybe is not None: | |||
| if callable(maybe): | |||
| if isinstance(maybe, collections.Callable): | |||
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ran 2to3 python conversion tool.
wholly untested.