Merge py3_test_resource.py into test_resource.py #355
Merged
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
Remove code for Twisted < 16.6, which is now well beyond it's support window.
wsanchez
commented
Jun 8, 2020
Comment on lines
-11
to
-18
|
|
||
| try: | ||
| from inspect import iscoroutine | ||
| except ImportError: | ||
|
|
||
| def iscoroutine(*args, **kwargs): # type: ignore | ||
| return False | ||
|
|
There was a problem hiding this comment.
We can assume iscoroutine is available; added in Python 3.5.
wsanchez
commented
Jun 8, 2020
Comment on lines
-27
to
-34
| try: | ||
| from twisted.internet.defer import ensureDeferred | ||
| except ImportError: | ||
|
|
||
| def ensureDeferred(*args, **kwagrs): | ||
| raise NotImplementedError("Coroutines support requires Twisted>=16.6") | ||
|
|
||
|
|
There was a problem hiding this comment.
Twisted <16.6 hasn't been on our test matrix for some time
wsanchez
commented
Jun 8, 2020
Comment on lines
-5
to
-8
| try: | ||
| from constantly import NamedConstant, Names | ||
| except ImportError: # pragma: no cover | ||
| from twisted.python.constants import NamedConstant, Names |
There was a problem hiding this comment.
pragma: no cover is here because no version of Twisted in our test matrix causes this code to be used. Let's just assume Twisted is using constantly.
Codecov Report
@@ Coverage Diff @@
## master #355 +/- ##
==========================================
+ Coverage 97.87% 98.24% +0.36%
==========================================
Files 48 47 -1
Lines 3915 3885 -30
Branches 259 256 -3
==========================================
- Hits 3832 3817 -15
+ Misses 62 50 -12
+ Partials 21 18 -3
Continue to review full report at Codecov.
|
glyph
approved these changes
Jun 9, 2020
For the record, I'm not adding any tests; I'm simply moving a test from one file to another. |
Put LeafResource content into a class variable.
archlinux-github
pushed a commit
to archlinux/svntogit-community
that referenced
this pull request
Jun 20, 2021
Most of patches are home-grown instead of from upstream, as upstream fixes are quite large and cannot be cleanly backported. Specifically, upstream moves test strategies from Klein to Hyperlink [1] and drop Python 2.x support [2,3]. The fix for Werkzeug 2.x in test_resource.py [3] is smaller, while it cannot be cleanly backported, either. [1] twisted/klein#393 [2] twisted/klein#328 [3] twisted/klein#355 [4] twisted/klein#499 git-svn-id: file:///srv/repos/svn-community/svn@965883 9fca08f4-af9d-4005-b8df-a31f2cc04f65
archlinux-github
pushed a commit
to archlinux/svntogit-community
that referenced
this pull request
Jun 20, 2021
Most of patches are home-grown instead of from upstream, as upstream fixes are quite large and cannot be cleanly backported. Specifically, upstream moves test strategies from Klein to Hyperlink [1] and drop Python 2.x support [2,3]. The fix for Werkzeug 2.x in test_resource.py [3] is smaller, while it cannot be cleanly backported, either. [1] twisted/klein#393 [2] twisted/klein#328 [3] twisted/klein#355 [4] twisted/klein#499 git-svn-id: file:///srv/repos/svn-community/svn@965883 9fca08f4-af9d-4005-b8df-a31f2cc04f65
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge
py3_test_resource.pyintotest_resource.py.The separate file was there to avoid confusing Python 2.
Opportunistically clean up some code that is now extraneous due to dropping Python 2 or old versions of Twisted.