Further codeformatting

* break up some extra long lines * add a bit of noqa for warnings I don't want to have * rework formatting for ip addr / ifconfig part
Code reformatting
2021-09-08 00:43:22 +02:00 · 2021-09-08 00:43:22 +02:00 · 2021-09-08 00:23:11 +02:00 · 2021-09-07 23:24:57 +02:00
5 changed files with 980 additions and 962 deletions
--- a/6
+++ b/6
@ -2,8 +2,10 @@ servefile changelog
 ===================


-Unreleased
----------
+2021-09-08 v0.5.2
+-----------------
+
+	0.5.2 released

 	* fixed bug where exception was shown on transmission abort with python3
 	* fixed wrong/outdated pyopenssl package names
--- a/servefile.1
+++ b/servefile.1
@ -1,4 +1,4 @@
-.TH SERVEFILE 1 "September 2020" "servefile 0.5.1" "User Commands"
+.TH SERVEFILE 1 "September 2021" "servefile 0.5.2" "User Commands"

 .SH NAME
 servefile \- small HTTP-Server for temporary file transfer
--- a/servefile/servefile.py
+++ b/servefile/servefile.py
--- a/setup.py
+++ b/setup.py
@ -11,7 +11,7 @@ setup(
    long_description=long_description,
    long_description_content_type='text/markdown',
    platforms='posix',
-    version='0.5.1',
+    version='0.5.2',
    license='GPLv3 or later',
    url='https://github.com/sebageek/servefile/',
    author='Sebastian Lohff',
--- a/tests/test_servefile.py
+++ b/tests/test_servefile.py
@ -92,11 +92,14 @@ def datadir(tmp_path):


 def make_request(path='/', host='localhost', port=SERVEFILE_DEFAULT_PORT, method='get', protocol='http', timeout=5,
-                 **kwargs):
+                 encoding='utf-8', **kwargs):
    url = '{}://{}:{}{}'.format(protocol, host, port, path)
    print('Calling {} on {} with {}'.format(method, url, kwargs))
    r = getattr(requests, method)(url, **kwargs)

+    if r.encoding is None and encoding:
+        r.encoding = encoding
+
    return r


@ -127,7 +130,7 @@ def _test_version(run_servefile, standalone):
        version = s.stdout.readline().decode().strip()

    # hardcode version as string until servefile is a module
-    assert version == 'servefile 0.5.1'
+    assert version == 'servefile 0.5.2'


 def test_version(run_servefile):
Author	SHA1	Message	Date
Sebastian Lohff	33defb85a7	Further codeformatting * break up some extra long lines * add a bit of noqa for warnings I don't want to have * rework formatting for ip addr / ifconfig part	2021-09-08 00:43:22 +02:00
Sebastian Lohff	579363201c	Code reformatting * replace tabs with spaces * replace some of the != None with is not None etc. * more whitespace fixes * remove all the newline \	2021-09-08 00:43:22 +02:00
Sebastian Lohff	cd28811fcf	Release v0.5.2	2021-09-08 00:23:11 +02:00
Sebastian Lohff	46d4433a1d	Explicitly set encoding for http requests in tests Due to the upgrade to charset-normalizer 2.0.4 guessing the encoding inside the tests did not work anymore and caused the umlaut tests to fail. Explicitly specifying the encoding on the requests' response object fixes this.	2021-09-07 23:24:57 +02:00