uploadserver 5.2.1__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.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: uploadserver
3
- Version: 5.2.1
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
 
@@ -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
 
@@ -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.1',
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',
@@ -339,7 +339,14 @@ def ssl_wrap(socket):
339
339
  f'root "{server_root}", exiting')
340
340
  sys.exit(3)
341
341
 
342
- 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)
343
350
 
344
351
  if args.client_certificate:
345
352
  # Client certificate handling
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: uploadserver
3
- Version: 5.2.1
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
 
File without changes
File without changes