Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix leaflet #742

Merged
merged 2 commits into from
Jan 6, 2024
Merged

Fix leaflet #742

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
400a84b
Fix leaflet
almarklein Dec 20, 2023
6e45b18
Add br to accept encoding
almarklein Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions flexxamples/howtos/leaflet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@


import os
from urllib.request import urlopen, Request
import re
import base64
import mimetypes

import requests # Note: you may need to "pip install requests brotli"
import brotli # noqa: requests needs this for br encoding
from flexx import flx


Expand All @@ -21,6 +22,10 @@
'marker-shadow.png',
]

request_headers = {
'User-Agent': 'flexx/%s' % flx.__version__,
'Accept-Encoding': 'gzip, deflate, br'
}

if 'LEAFLET_DIR' in os.environ:
_base_url = 'file://%s' % os.environ['LEAFLET_DIR']
Expand All @@ -33,8 +38,9 @@ def _get_code(item):
""" Get a text item from _base_url
"""
url = '%s/%s' % (_base_url, item)
req = Request(url, headers={'User-Agent': 'flexx/%s' % flx.__version__})
return urlopen(req).read().decode()
res = requests.get(url , headers=request_headers)
assert res.ok, f"{res.status_code}: {res.reason}"
return res.text


def _get_data(item_or_url):
Expand All @@ -44,8 +50,9 @@ def _get_data(item_or_url):
url = item_or_url
else:
url = '%s/%s' % (_base_url, item_or_url)
req = Request(url, headers={'User-Agent': 'flexx/%s' % flx.__version__})
return urlopen(req).read()
res = requests.get(url , headers=request_headers)
assert res.ok, f"{res.status_code}: {res.reason}"
return res.content


def _embed_css_resources(css, types=('.png',)):
Expand Down Expand Up @@ -281,5 +288,5 @@ def handle_leaflet_mouse(self, *events):


if __name__ == '__main__':
flx.launch(LeafletExample, 'firefox')
flx.launch(LeafletExample, 'chrome-browser')
flx.run()
Loading