NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-09-19 08:20:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2573 from GNS3/bugfix/2541

Browse Source 
Python 3.14 compatibility
This commit is contained in:
Jeremy Grossmann 2025-11-17 11:30:42 +10:00 committed by GitHub
commit 32f48e555c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/utils/file_watcher.py
View File

@ -60,7 +60,14 @@ class FileWatcher:
self._hashed[path] = zlib.adler32(open(path, 'rb').read()) self._hashed[path] = zlib.adler32(open(path, 'rb').read())
except OSError: except OSError:
self._hashed[path] = None self._hashed[path] = None
asyncio.get_event_loop().call_later(self._delay, self._check_config_file_change)
try:
loop = asyncio.get_running_loop()
except RuntimeError:
loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
loop.call_later(self._delay, self._check_config_file_change)
def __del__(self): def __del__(self):
self._closed = True self._closed = True

5
gns3server/web/web_server.py
View File

@ -293,6 +293,11 @@ class WebServer:
raise SystemExit raise SystemExit
self._ssl_context = self._create_ssl_context(server_config) self._ssl_context = self._create_ssl_context(server_config)
try:
self._loop = asyncio.get_running_loop()
except RuntimeError:
self._loop = asyncio.new_event_loop()
asyncio.set_event_loop(self._loop)
self._loop = asyncio.get_event_loop() self._loop = asyncio.get_event_loop()
if log.getEffectiveLevel() == logging.DEBUG: if log.getEffectiveLevel() == logging.DEBUG:

8
tests/test_config.py
View File

@ -53,7 +53,7 @@ def write_config(tmpdir, settings):
return path return path
async def test_get_section_config(tmpdir): def test_get_section_config(tmpdir):
config = load_config(tmpdir, { config = load_config(tmpdir, {
"Server": { "Server": {
@ -63,7 +63,7 @@ async def test_get_section_config(tmpdir):
assert dict(config.get_section_config("Server")) == {"host": "127.0.0.1"} assert dict(config.get_section_config("Server")) == {"host": "127.0.0.1"}
async def test_set_section_config(tmpdir): def test_set_section_config(tmpdir):
config = load_config(tmpdir, { config = load_config(tmpdir, {
"Server": { "Server": {
@ -77,7 +77,7 @@ async def test_set_section_config(tmpdir):
assert dict(config.get_section_config("Server")) == {"host": "192.168.1.1", "local": "true"} assert dict(config.get_section_config("Server")) == {"host": "192.168.1.1", "local": "true"}
async def test_set(tmpdir): def test_set(tmpdir):
config = load_config(tmpdir, { config = load_config(tmpdir, {
"Server": { "Server": {
@ -90,7 +90,7 @@ async def test_set(tmpdir):
assert dict(config.get_section_config("Server")) == {"host": "192.168.1.1"} assert dict(config.get_section_config("Server")) == {"host": "192.168.1.1"}
async def test_reload(tmpdir): def test_reload(tmpdir):
config = load_config(tmpdir, { config = load_config(tmpdir, {
"Server": { "Server": {