Skip to content

Don't convert bytes headers to str#1755

Merged
jaraco merged 2 commits into
cherrypy:maint/17.xfrom
h3llrais3r:byte-headers
Nov 23, 2018
Merged

Don't convert bytes headers to str#1755
jaraco merged 2 commits into
cherrypy:maint/17.xfrom
h3llrais3r:byte-headers

Conversation

@h3llrais3r
Copy link
Copy Markdown
Contributor

@h3llrais3r h3llrais3r commented Nov 4, 2018

Backport #1736
Also fixes Lawouach/WebSocket-for-Python#252

What kind of change does this PR introduce?

  • bug fix

@webknjaz
Copy link
Copy Markdown
Member

webknjaz commented Nov 4, 2018

Hey @h3llrais3r could you please fix tests?

@webknjaz webknjaz requested a review from jaraco November 4, 2018 18:10
@h3llrais3r
Copy link
Copy Markdown
Contributor Author

h3llrais3r commented Nov 5, 2018

@webknjaz Can you check again?
I've fixed the travis build (flake8 error) but still errors for pydocstyle (not related to my changes) and tests against latest Python nightly.
As far as I can see, the AppVeyor tests are working fine for Python 2.7, Python 3.5 and Python 3.6. Python 3.5 is not working, but that's not related to my changes...

@codecov
Copy link
Copy Markdown

codecov Bot commented Nov 5, 2018

Codecov Report

Merging #1755 into maint/17.x will decrease coverage by 1.97%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##           maint/17.x    #1755      +/-   ##
==============================================
- Coverage       80.91%   78.94%   -1.98%     
==============================================
  Files             104      104              
  Lines           13486    13491       +5     
==============================================
- Hits            10912    10650     -262     
- Misses           2574     2841     +267

Comment thread cherrypy/lib/httputil.py
@webknjaz webknjaz requested review from jaraco and removed request for jaraco November 7, 2018 13:00
Comment thread cherrypy/test/test_encoding.py
@jaraco jaraco merged commit 4ca9959 into cherrypy:maint/17.x Nov 23, 2018
@h3llrais3r h3llrais3r deleted the byte-headers branch November 23, 2018 08:59
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.

3 participants