adafruit-circuitpython-httpserver 4.6.3__tar.gz → 4.7.0__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 (81) hide show
  1. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/.readthedocs.yaml +1 -1
  2. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/PKG-INFO +1 -1
  3. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_circuitpython_httpserver.egg-info/PKG-INFO +1 -1
  4. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/__init__.py +1 -1
  5. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/server.py +16 -3
  6. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/starting_methods.rst +2 -4
  7. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_simpletest_manual_ethernet.py +3 -4
  8. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/pyproject.toml +1 -1
  9. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/.gitattributes +0 -0
  10. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/.github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md +0 -0
  11. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/.github/workflows/build.yml +0 -0
  12. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/.github/workflows/failure-help-text.yml +0 -0
  13. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/.github/workflows/release_gh.yml +0 -0
  14. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/.github/workflows/release_pypi.yml +0 -0
  15. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/.gitignore +0 -0
  16. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/.pre-commit-config.yaml +0 -0
  17. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/CODE_OF_CONDUCT.md +0 -0
  18. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/LICENSE +0 -0
  19. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/LICENSES/CC-BY-4.0.txt +0 -0
  20. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/LICENSES/MIT.txt +0 -0
  21. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/LICENSES/Unlicense.txt +0 -0
  22. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/README.rst +0 -0
  23. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/README.rst.license +0 -0
  24. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_circuitpython_httpserver.egg-info/SOURCES.txt +0 -0
  25. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_circuitpython_httpserver.egg-info/dependency_links.txt +0 -0
  26. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_circuitpython_httpserver.egg-info/requires.txt +0 -0
  27. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_circuitpython_httpserver.egg-info/top_level.txt +0 -0
  28. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/authentication.py +0 -0
  29. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/exceptions.py +0 -0
  30. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/headers.py +0 -0
  31. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/interfaces.py +0 -0
  32. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/methods.py +0 -0
  33. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/mime_types.py +0 -0
  34. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/request.py +0 -0
  35. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/response.py +0 -0
  36. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/route.py +0 -0
  37. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/adafruit_httpserver/status.py +0 -0
  38. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/_static/favicon.ico +0 -0
  39. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/_static/favicon.ico.license +0 -0
  40. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/api.rst +0 -0
  41. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/api.rst.license +0 -0
  42. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/conf.py +0 -0
  43. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/examples.rst +0 -0
  44. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/examples.rst.license +0 -0
  45. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/index.rst +0 -0
  46. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/index.rst.license +0 -0
  47. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/requirements.txt +0 -0
  48. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/docs/starting_methods.rst.license +0 -0
  49. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/directory_listing.tpl.html +0 -0
  50. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/home.html +0 -0
  51. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_authentication_handlers.py +0 -0
  52. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_authentication_server.py +0 -0
  53. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_chunked.py +0 -0
  54. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_cookies.py +0 -0
  55. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_cpu_information.py +0 -0
  56. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_cpython.py +0 -0
  57. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_form_data.py +0 -0
  58. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_handler_serves_file.py +0 -0
  59. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_https.py +0 -0
  60. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_mdns.py +0 -0
  61. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_methods.py +0 -0
  62. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_multiple_servers.py +0 -0
  63. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_neopixel.py +0 -0
  64. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_redirects.py +0 -0
  65. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_simpletest_auto_connection_manager.py +0 -0
  66. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_simpletest_auto_settings_toml.py +0 -0
  67. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_simpletest_manual_ap.py +0 -0
  68. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_simpletest_manual_wifi.py +0 -0
  69. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_sse.py +0 -0
  70. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_start_and_poll.py +0 -0
  71. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_start_and_poll_asyncio.py +0 -0
  72. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_static_files_serving.py +0 -0
  73. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_templates.py +0 -0
  74. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_url_parameters.py +0 -0
  75. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_video_stream.py +0 -0
  76. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/httpserver_websocket.py +0 -0
  77. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/examples/settings.toml +0 -0
  78. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/optional_requirements.txt +0 -0
  79. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/requirements.txt +0 -0
  80. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/ruff.toml +0 -0
  81. {adafruit_circuitpython_httpserver-4.6.3 → adafruit_circuitpython_httpserver-4.7.0}/setup.cfg +0 -0
@@ -12,7 +12,7 @@ sphinx:
12
12
  configuration: docs/conf.py
13
13
 
14
14
  build:
15
- os: ubuntu-20.04
15
+ os: ubuntu-lts-latest
16
16
  tools:
17
17
  python: "3"
18
18
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: adafruit-circuitpython-httpserver
3
- Version: 4.6.3
3
+ Version: 4.7.0
4
4
  Summary: Simple HTTP Server for CircuitPython
5
5
  Author-email: Adafruit Industries <circuitpython@adafruit.com>
6
6
  License: MIT
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: adafruit-circuitpython-httpserver
3
- Version: 4.6.3
3
+ Version: 4.7.0
4
4
  Summary: Simple HTTP Server for CircuitPython
5
5
  Author-email: Adafruit Industries <circuitpython@adafruit.com>
6
6
  License: MIT
@@ -19,7 +19,7 @@ Implementation Notes
19
19
  https://github.com/adafruit/circuitpython/releases
20
20
  """
21
21
 
22
- __version__ = "4.6.3"
22
+ __version__ = "4.7.0"
23
23
  __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_HTTPServer.git"
24
24
 
25
25
 
@@ -13,7 +13,6 @@ except ImportError:
13
13
  pass
14
14
 
15
15
  from errno import EAGAIN, ECONNRESET, ETIMEDOUT
16
- from ssl import SSLContext, create_default_context
17
16
  from sys import implementation
18
17
  from time import monotonic, sleep
19
18
  from traceback import print_exception
@@ -34,8 +33,20 @@ from .response import FileResponse, Response
34
33
  from .route import Route
35
34
  from .status import BAD_REQUEST_400, FORBIDDEN_403, NOT_FOUND_404, UNAUTHORIZED_401
36
35
 
37
- if implementation.name != "circuitpython":
38
- from ssl import CERT_NONE, Purpose, SSLError
36
+ try:
37
+ from ssl import SSLContext, create_default_context
38
+
39
+ try: # ssl imports for C python
40
+ from ssl import (
41
+ CERT_NONE,
42
+ Purpose,
43
+ SSLError,
44
+ )
45
+ except ImportError:
46
+ pass
47
+ SSL_AVAILABLE = True
48
+ except ImportError:
49
+ SSL_AVAILABLE = False
39
50
 
40
51
 
41
52
  NO_REQUEST = "no_request"
@@ -129,6 +140,8 @@ class Server:
129
140
  self.https = https
130
141
 
131
142
  if https:
143
+ if not SSL_AVAILABLE:
144
+ raise NotImplementedError("SSL not available on this platform")
132
145
  self._validate_https_cert_provided(certfile, keyfile)
133
146
  self._ssl_context = self._create_ssl_context(certfile, keyfile)
134
147
  else:
@@ -28,13 +28,11 @@ it may not be able to access the internet.
28
28
  Manual Ethernet
29
29
  ---------------
30
30
 
31
- Most of the time, the WiFi will be a preferred way of connecting to the network.
32
- Nevertheless it is also possible to use Ethernet instead of WiFi.
33
- The only difference in usage is related to configuring the ``socket_source`` differently.
31
+ Ethernet can also be used to connect to the location network.
34
32
 
35
33
  .. literalinclude:: ../examples/httpserver_simpletest_manual_ethernet.py
36
34
  :caption: examples/httpserver_simpletest_manual_ethernet.py
37
- :emphasize-lines: 7,10,12-24,37
35
+ :emphasize-lines: 11-20
38
36
  :linenos:
39
37
 
40
38
  Automatic WiFi using ``settings.toml``
@@ -2,9 +2,9 @@
2
2
  #
3
3
  # SPDX-License-Identifier: MIT
4
4
 
5
+ import adafruit_connection_manager
5
6
  import board
6
7
  import digitalio
7
- from adafruit_wiznet5k import adafruit_wiznet5k_socket as socket
8
8
  from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
9
9
 
10
10
  from adafruit_httpserver import Request, Response, Server
@@ -20,10 +20,9 @@ spi_bus = board.SPI()
20
20
  # Initialize ethernet interface with DHCP
21
21
  eth = WIZNET5K(spi_bus, cs)
22
22
 
23
- # Set the interface on the socket source
24
- socket.set_interface(eth)
23
+ pool = adafruit_connection_manager.get_radio_socketpool(eth)
25
24
 
26
- server = Server(socket, "/static", debug=True)
25
+ server = Server(pool, "/static", debug=True)
27
26
 
28
27
 
29
28
  @server.route("/")
@@ -12,7 +12,7 @@ requires = [
12
12
  [project]
13
13
  name = "adafruit-circuitpython-httpserver"
14
14
  description = "Simple HTTP Server for CircuitPython"
15
- version = "4.6.3"
15
+ version = "4.7.0"
16
16
  readme = "README.rst"
17
17
  authors = [
18
18
  {name = "Adafruit Industries", email = "circuitpython@adafruit.com"}