uploadserver 5.2.0__tar.gz → 5.2.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. {uploadserver-5.2.0/uploadserver.egg-info → uploadserver-5.2.2}/PKG-INFO +2 -2
  2. {uploadserver-5.2.0 → uploadserver-5.2.2}/README.md +1 -1
  3. {uploadserver-5.2.0 → uploadserver-5.2.2}/setup.py +1 -1
  4. {uploadserver-5.2.0 → uploadserver-5.2.2}/uploadserver/__init__.py +10 -2
  5. {uploadserver-5.2.0 → uploadserver-5.2.2/uploadserver.egg-info}/PKG-INFO +2 -2
  6. {uploadserver-5.2.0 → uploadserver-5.2.2}/LICENSE +0 -0
  7. {uploadserver-5.2.0 → uploadserver-5.2.2}/setup.cfg +0 -0
  8. {uploadserver-5.2.0 → uploadserver-5.2.2}/uploadserver/__main__.py +0 -0
  9. {uploadserver-5.2.0 → uploadserver-5.2.2}/uploadserver/cgi.py +0 -0
  10. {uploadserver-5.2.0 → uploadserver-5.2.2}/uploadserver.egg-info/SOURCES.txt +0 -0
  11. {uploadserver-5.2.0 → uploadserver-5.2.2}/uploadserver.egg-info/dependency_links.txt +0 -0
  12. {uploadserver-5.2.0 → uploadserver-5.2.2}/uploadserver.egg-info/entry_points.txt +0 -0
  13. {uploadserver-5.2.0 → uploadserver-5.2.2}/uploadserver.egg-info/top_level.txt +0 -0
{uploadserver-5.2.0/uploadserver.egg-info → uploadserver-5.2.2}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: uploadserver
3
- Version: 5.2.0
3
+ Version: 5.2.2
4
4
  Summary: Python's http.server extended to include a file upload page
5
5
  Home-page: https://github.com/Densaugeo/uploadserver
6
6
  Author: Densaugeo
@@ -17,7 +17,7 @@ License-File: LICENSE
17
17
  Python's http.server extended to include a file upload page
18
18
 
19
19
  [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://mit-license.org/)
20
- [![Build Status](https://travis-ci.com/Densaugeo/uploadserver.svg?branch=master)](https://travis-ci.com/github/Densaugeo/uploadserver)
20
+ [![Build Status](https://app.travis-ci.com/Densaugeo/uploadserver.svg?branch=master)](https://app.travis-ci.com/github/Densaugeo/uploadserver)
21
21
 
22
22
  ## Supported Platforms
23
23
 
{uploadserver-5.2.0 → uploadserver-5.2.2}/README.md RENAMED
@@ -3,7 +3,7 @@
3
3
  Python's http.server extended to include a file upload page
4
4
 
5
5
  [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://mit-license.org/)
6
- [![Build Status](https://travis-ci.com/Densaugeo/uploadserver.svg?branch=master)](https://travis-ci.com/github/Densaugeo/uploadserver)
6
+ [![Build Status](https://app.travis-ci.com/Densaugeo/uploadserver.svg?branch=master)](https://app.travis-ci.com/github/Densaugeo/uploadserver)
7
7
 
8
8
  ## Supported Platforms
9
9
 
{uploadserver-5.2.0 → uploadserver-5.2.2}/setup.py RENAMED
@@ -5,7 +5,7 @@ with open('README.md', 'r') as fh:
5
5
 
6
6
  setuptools.setup(
7
7
  name='uploadserver',
8
- version='5.2.0',
8
+ version='5.2.2',
9
9
  author='Densaugeo',
10
10
  author_email='author@example.com',
11
11
  description='Python\'s http.server extended to include a file upload page',
{uploadserver-5.2.0 → uploadserver-5.2.2}/uploadserver/__init__.py RENAMED
@@ -82,7 +82,8 @@ def get_directory_head_injection(theme):
82
82
  ''', 'utf-8')
83
83
 
84
84
  DIRECTORY_BODY_INJECTION = b'''<!-- Injected by uploadserver -->
85
- <a href="upload">File upload</a> (provided by uploadserver)
85
+ <a href="/upload">File upload</a>
86
+ (provided by uploadserver, all files go to server root)
86
87
  <hr>
87
88
  <!-- End injection by uploadserver -->
88
89
  '''
@@ -338,7 +339,14 @@ def ssl_wrap(socket):
338
339
  f'root "{server_root}", exiting')
339
340
  sys.exit(3)
340
341
 
341
- context.load_cert_chain(certfile=server_certificate)
342
+ try:
343
+ context.load_cert_chain(certfile=server_certificate)
344
+ except ssl.SSLError as e:
345
+ print(f'Unable to load certificate "{server_certificate}", exiting\n\n'
346
+ f'NOTE: Certificate must be a single file in .pem format. If you '
347
+ 'have multiple certificate files, such as Let\'s Encrypt provides, '
348
+ 'you can cat them together to get one file.')
349
+ sys.exit(4)
342
350
 
343
351
  if args.client_certificate:
344
352
  # Client certificate handling
{uploadserver-5.2.0 → uploadserver-5.2.2/uploadserver.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: uploadserver
3
- Version: 5.2.0
3
+ Version: 5.2.2
4
4
  Summary: Python's http.server extended to include a file upload page
5
5
  Home-page: https://github.com/Densaugeo/uploadserver
6
6
  Author: Densaugeo
@@ -17,7 +17,7 @@ License-File: LICENSE
17
17
  Python's http.server extended to include a file upload page
18
18
 
19
19
  [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://mit-license.org/)
20
- [![Build Status](https://travis-ci.com/Densaugeo/uploadserver.svg?branch=master)](https://travis-ci.com/github/Densaugeo/uploadserver)
20
+ [![Build Status](https://app.travis-ci.com/Densaugeo/uploadserver.svg?branch=master)](https://app.travis-ci.com/github/Densaugeo/uploadserver)
21
21
 
22
22
  ## Supported Platforms
23
23
 
{uploadserver-5.2.0 → uploadserver-5.2.2}/LICENSE RENAMED
File without changes
{uploadserver-5.2.0 → uploadserver-5.2.2}/setup.cfg RENAMED
File without changes