Skip to content
Snippets Groups Projects
Commit cc70a9cd authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Drop the workaround for the problem with older prometheus_client

parent 9936c1fd
No related branches found
No related tags found
1 merge request!278Port to Python 3
...@@ -68,20 +68,6 @@ from .storage_common import ( ...@@ -68,20 +68,6 @@ from .storage_common import (
slot_testv_and_readv_and_writev_message, slot_testv_and_readv_and_writev_message,
) )
# The last Python 2-supporting prometheus_client nevertheless tries to use
# FileNotFoundError, an exception type from Python 3. Since that release,
# prometheus_client has dropped Python 2 support entirely so there is little
# hope of ever having this fixed upstream. When ZKAPAuthorizer is ported to
# Python 3, this should no longer be necessary.
def _prometheus_client_fix():
import prometheus_client.exposition
prometheus_client.exposition.FileNotFoundError = IOError
_prometheus_client_fix()
# See allmydata/storage/mutable.py # See allmydata/storage/mutable.py
SLOT_HEADER_SIZE = 468 SLOT_HEADER_SIZE = 468
LEASE_TRAILER_SIZE = 4 LEASE_TRAILER_SIZE = 4
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment