Fix flake8 issue WPS336 (explicit str concat) #254

alephnot0 · 2019-12-03T04:10:26Z

❓ What kind of change does this PR introduce?

📋 What is the related issue number (starting with #)

#253 - flake8 style cleanup.

❓ What is the current behavior? (You can also link to an open issue here)

➜  cheroot git:(master) ✗ flake8 . | grep WPS336
./cheroot/server.py:159:33: WPS336 Found explicit string concat
./cheroot/server.py:470:30: WPS336 Found explicit string concat
./cheroot/server.py:825:47: WPS336 Found explicit string concat
./cheroot/server.py:1041:20: WPS336 Found explicit string concat
./cheroot/server.py:1502:15: WPS336 Found explicit string concat
./cheroot/server.py:1808:32: WPS336 Found explicit string concat
./cheroot/wsgi.py:303:14: WPS336 Found explicit string concat
./cheroot/wsgi.py:412:36: WPS336 Found explicit string concat
./cheroot/test/test_conn.py:841:12: WPS336 Found explicit string concat
./cheroot/test/test_conn.py:841:40: WPS336 Found explicit string concat
./cheroot/test/test_conn.py:975:15: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:192:9: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:192:34: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:192:52: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:277:13: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:277:38: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:277:56: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:485:13: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:485:32: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:485:50: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:496:13: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:496:32: WPS336 Found explicit string concat
./cheroot/test/test_ssl.py:496:50: WPS336 Found explicit string concat
./cheroot/workers/threadpool.py:179:28: WPS336 Found explicit string concat
./cheroot/workers/threadpool.py:226:24: WPS336 Found explicit string concat

❓ What is the new behavior (if this is a feature change)?

➜  cheroot git:(master) flake8 . | grep WPS336
➜  cheroot git:(master)

📋 Other information:

📋 Checklist:

I think the code is well written
I wrote good commit messages
I have squashed related commits together after the changes have been approved
Unit tests for the changes exist
Integration tests for the changes exist (if applicable)
I used the same coding conventions as the rest of the project
The new code doesn't generate linter offenses
Documentation reflects the changes
The PR relates to only one subject with a clear title
and description in grammatically correct, complete sentences

This change is

…it string concat

…dent

codecov · 2019-12-03T04:32:00Z

Codecov Report

Merging #254 into master will decrease coverage by 1.21%.
The diff coverage is 72.72%.

@@            Coverage Diff             @@
##           master     #254      +/-   ##
==========================================
- Coverage   78.35%   77.13%   -1.22%     
==========================================
  Files          25       25              
  Lines        3816     3727      -89     
==========================================
- Hits         2990     2875     -115     
- Misses        826      852      +26

webknjaz · 2019-12-03T22:24:16Z

cheroot/server.py

- msg = self.server.protocol.encode('ascii')
- msg += b' 100 Continue\r\n\r\n'
+ msg = b''.join([self.server.protocol.encode('ascii'),
+  b' 100 Contunue\r\n\r\n'])


Suggested change

b' 100 Contunue\r\n\r\n'])

b' 100 Continue\r\n\r\n'])

webknjaz · 2019-12-03T22:28:56Z

cheroot/server.py

- msg = self.server.protocol.encode('ascii')
- msg += b' 100 Continue\r\n\r\n'
+ msg = b''.join([self.server.protocol.encode('ascii'),
+  b' 100 Contunue\r\n\r\n'])


But better use string interpolation because it would be better readable this way.
Like

b'{} {}'.format( self.server.protocol.encode('ascii'), b' 100 Continue\r\n\r\n', )

webknjaz

Thanks for the PR. It is better to prefer newer and faster str.format() over the %-interpolation syntax. Would you mind doing this?

webknjaz · 2019-12-03T22:32:22Z

@alephnot0 it looks like your Git is misconfigured: the commits you submitted have author email that doesn't match your GitHub account. You may want to fix that as well.

alephnot0 · 2019-12-04T02:16:38Z

@webknjaz no I wouldn't mind, thanks for the feedback.

lgtm-com · 2019-12-04T03:00:12Z

This pull request introduces 1 alert and fixes 3 when merging 1e7a23b into 85a190f - view on LGTM.com

new alerts:

1 for Syntax error

fixed alerts:

2 for Unused local variable
1 for __init__ method calls overridden method

lgtm-com · 2019-12-04T04:38:28Z

This pull request introduces 1 alert and fixes 3 when merging 3afec78 into 85a190f - view on LGTM.com

new alerts:

1 for Syntax error

fixed alerts:

2 for Unused local variable
1 for __init__ method calls overridden method

…thod call

cheroot/server.py

webknjaz · 2019-12-05T02:03:29Z

cheroot/test/test_conn.py

@@ -838,7 +838,8 @@ def test_Chunked_Encoding(test_client):

 # Try a chunked request that exceeds server.max_request_body_size.
 # Note that the delimiters and trailer are included.
- body = b'3e3\r\n' + (b'x' * 995) + b'\r\n0\r\n\r\n'
+ body = '{}{}{}'.format('3e3\r\n', 'x' * 995, '\r\n0\r\n\r\n') \
+ .encode('ascii')


Please use proper literals instead of heavy encode/decode methods. It's also a good place for bytes.join(). Same with escaping EOL.

webknjaz · 2019-12-05T02:04:25Z

cheroot/test/test_conn.py

@@ -971,8 +972,8 @@ def test_No_CRLF(test_client, invalid_terminator):
 # Initialize a persistent HTTP connection
 conn = test_client.get_connection()

- # (b'%s' % b'') is not supported in Python 3.4, so just use +
- conn.send(b'GET /hello HTTP/1.1' + invalid_terminator)
+ conn.send('GET /hello HTTP/1.1{}'.format(invalid_terminator)


We work with bytes so we need to explicitly say that it's bytes.

webknjaz · 2019-12-05T02:05:27Z

cheroot/wsgi.py

@@ -300,7 +300,7 @@ def get_environ(self):

 # Request headers
 env.update(
- ('HTTP_' + bton(k).upper().replace('-', '_'), bton(v))
+ ('HTTP_%s' % (bton(k).upper().replace('-', '_')), bton(v))


Use str.format() in this module.

addressed

alephnot0 · 2020-01-03T00:22:06Z

@webknjaz thank you for merging. I will be continuing to contribute as I have time.

RJ Seibert added 7 commits December 2, 2019 22:50

modified 3/5 files to conform to flake8 WPS336 style, removing explic…

5c3a47b

…it string concat

finished up the other two files, removed explicit string concatenation

ed51081

finished up the other two files, removed explicit string concatenation

ad6180a

addressing 3 long lines identified by codeclimate

f79d837

addressed tox test failures, where name 'b' was not defined

b5211c6

Merge branch 'master' of https://github.com/alephnot0/cheroot

a05b2ae

PEP-8 style issue, continuation line was under-indented for visual in…

f77e0cc

…dent

webknjaz reviewed Dec 3, 2019

View reviewed changes

webknjaz previously requested changes Dec 3, 2019

View reviewed changes

alephnot0 added 2 commits December 3, 2019 21:42

respond to feedback, use string interpolation

9fec76f

encode both operands in ascii rather than b''

1e7a23b

string interpolation where possible for appending strings

3afec78

alephnot0 added 9 commits December 3, 2019 23:43

string interpolation where possible and fix indent with .format... me…

eb61549

…thod call

two instances where lines are too long

be7d15d

two redundant backslashes

75d389f

backslash needed for line continuation

b9652e4

flake8 rules around hanging and visual indents

dd7b872

flake8 rules around hanging and visual indents

a9837da

codeclimate - unaligned for hanging indent

6b29ab1

flake8 fixing over indentation

4785d39

flake8 fixing over indentation

4951cfc