Skip to content

Commit

Permalink
Migrate from imp to importlib
Browse files Browse the repository at this point in the history
- the 'imp' module is deprecated from years and now Python 3.12 finally
  drops completely support of 'imp' module.
- fix for vegastrike#107
  • Loading branch information
david-geiger committed Apr 21, 2024
1 parent 431b73e commit 9006c54
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions modules/custom.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import VS
import traceback
import sys
import imp
import importlib

procedures = {
}
Expand Down Expand Up @@ -124,7 +124,7 @@ def processMessage(local, cmd, argstr, id):
for arg in args:
print(arg)
if cmd=='reloadlib' and local and len(args)>=1:
imp.reload(__import__(args[0]))
importlib.reload(__import__(args[0]))
VS.IOmessage(0, "game", "p"+str(cp), "Reloaded "+str(args[0]))
elif cmd=='local':
# simple way of bouncing back message to client....
Expand Down
4 changes: 2 additions & 2 deletions modules/dj.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import dj_lib
import imp
imp.reload(dj_lib)
import importlib
importlib.reload(dj_lib)
dj_lib.PlayMusik()
4 changes: 2 additions & 2 deletions modules/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import unit
import sys
import traceback
import imp
import importlib
import custom

import server_lib
Expand Down Expand Up @@ -176,7 +176,7 @@ def processMessage(cp, localhost, command, arglist=None, id=''):
if authlevel<1:
return
mod=server_lib
imp.reload(mod)
importlib.reload(mod)
VS.IOmessage(0,"game","all","The server python script has been reloaded!")
print(mod.__name__+' has been reloaded!')
else:
Expand Down
4 changes: 2 additions & 2 deletions modules/server_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import faction_ships
import custom
import campaign_lib
import imp
import importlib

def serverDirector():
return server.getDirector()
Expand Down Expand Up @@ -142,7 +142,7 @@ def processMessage(player, auth, command, args, id=''):
if auth<1:
return
vsmod=VS
imp.reload(__import__('server_lib'))
importlib.reload(__import__('server_lib'))
vsmod.IOmessage(0,"game","all","The server python script has been reloaded.")
elif command=='userlist':
cstr = '#44cc44Users on the server:#888800'
Expand Down

0 comments on commit 9006c54

Please sign in to comment.