Compare commits
4 Commits
4161a3d721
...
33defb85a7
Author | SHA1 | Date |
---|---|---|
Sebastian Lohff | 33defb85a7 | |
Sebastian Lohff | 579363201c | |
Sebastian Lohff | cd28811fcf | |
Sebastian Lohff | 46d4433a1d |
|
@ -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 bug where exception was shown on transmission abort with python3
|
||||||
* fixed wrong/outdated pyopenssl package names
|
* fixed wrong/outdated pyopenssl package names
|
||||||
|
|
|
@ -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
|
.SH NAME
|
||||||
servefile \- small HTTP-Server for temporary file transfer
|
servefile \- small HTTP-Server for temporary file transfer
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
2
setup.py
2
setup.py
|
@ -11,7 +11,7 @@ setup(
|
||||||
long_description=long_description,
|
long_description=long_description,
|
||||||
long_description_content_type='text/markdown',
|
long_description_content_type='text/markdown',
|
||||||
platforms='posix',
|
platforms='posix',
|
||||||
version='0.5.1',
|
version='0.5.2',
|
||||||
license='GPLv3 or later',
|
license='GPLv3 or later',
|
||||||
url='https://github.com/sebageek/servefile/',
|
url='https://github.com/sebageek/servefile/',
|
||||||
author='Sebastian Lohff',
|
author='Sebastian Lohff',
|
||||||
|
|
|
@ -92,11 +92,14 @@ def datadir(tmp_path):
|
||||||
|
|
||||||
|
|
||||||
def make_request(path='/', host='localhost', port=SERVEFILE_DEFAULT_PORT, method='get', protocol='http', timeout=5,
|
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)
|
url = '{}://{}:{}{}'.format(protocol, host, port, path)
|
||||||
print('Calling {} on {} with {}'.format(method, url, kwargs))
|
print('Calling {} on {} with {}'.format(method, url, kwargs))
|
||||||
r = getattr(requests, method)(url, **kwargs)
|
r = getattr(requests, method)(url, **kwargs)
|
||||||
|
|
||||||
|
if r.encoding is None and encoding:
|
||||||
|
r.encoding = encoding
|
||||||
|
|
||||||
return r
|
return r
|
||||||
|
|
||||||
|
|
||||||
|
@ -127,7 +130,7 @@ def _test_version(run_servefile, standalone):
|
||||||
version = s.stdout.readline().decode().strip()
|
version = s.stdout.readline().decode().strip()
|
||||||
|
|
||||||
# hardcode version as string until servefile is a module
|
# 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):
|
def test_version(run_servefile):
|
||||||
|
|
Loading…
Reference in New Issue