Removed DB plugin, moved into xsbs module

src/pyscripts/Bans/bans.py

@@ -2,10 +2,10 @@
 from xsbs.settings import PluginConfig
 from xsbs.colors import red, colordict
 from xsbs.ui import insufficientPermissions, error, info
+from xsbs.db import dbmanager
 from xsbs.events import triggerServerEvent, registerServerEventHandler, registerPolicyEventHandler, execLater
 from UserPrivilege.userpriv import registerCommandHandler, masterRequired
 from xsbs.net import ipLongToString, ipStringToLong
-from DB.db import dbmanager
 from sqlalchemy import Column, Integer, String, Boolean, ForeignKey
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm.exc import NoResultFound

src/pyscripts/ClanTagProtection/tagprotect.py

@@ -3,11 +3,11 @@
 from xsbs.ui import warning
 from xsbs.colors import red
 from xsbs.timers import addTimer
+from xsbs.db import dbmanager
 from Bans.bans import ban
 from UserManager.usermanager import User, isLoggedIn
 from NickReserve.nickreserve import nickReserver
 import sbserver
-from DB.db import dbmanager
 from sqlalchemy.orm import relation
 from sqlalchemy import Column, Integer, String, ForeignKey
 from sqlalchemy.ext.declarative import declarative_base

src/pyscripts/NamesDb/namesdb.py

@@ -1,11 +1,11 @@
-from DB.db import dbmanager
 from sqlalchemy import Column, Integer, String, Boolean, ForeignKey
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm.exc import NoResultFound
 from xsbs.settings import PluginConfig
 from xsbs.events import registerServerEventHandler
 from xsbs.ui import error, info, insufficientPermissions
 from xsbs.commands import registerCommandHandler
+from xsbs.db import dbmanager
 from UserPrivilege.userpriv import isPlayerMaster
 import sbserver
 

src/pyscripts/NickReserve/nickreserve.py

@@ -1,4 +1,3 @@
-from DB.db import dbmanager
 from sqlalchemy.orm.exc import NoResultFound
 from UserManager.usermanager import session, NickAccount, isLoggedIn, loggedInAs
 from Bans.bans import ban
@@ -9,6 +8,7 @@
 from xsbs.colors import red, blue
 from xsbs.ui import warning
 from xsbs.players import player
+from xsbs.db import dbmanager
 
 blocked_nicks = ['unnamed']
 

src/pyscripts/UserManager/usermanager.py

@@ -1,9 +1,9 @@
-from DB.db import dbmanager
 from sqlalchemy import Column, Integer, String, Boolean, ForeignKey
 from sqlalchemy.orm import relation
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm.exc import NoResultFound
 import sbserver
+from xsbs.db import dbmanager
 from xsbs.events import triggerServerEvent, registerServerEventHandler, registerPolicyEventHandler
 from xsbs.commands import registerCommandHandler
 from xsbs.colors import red, green, orange

src/pyscripts/UserPrivilege/userpriv.py

@@ -1,5 +1,4 @@
 import sbserver
-from DB.db import dbmanager
 from UserManager.usermanager import User, loggedInAs
 
 from sqlalchemy import Column, Integer, String, Boolean, ForeignKey
@@ -13,6 +12,7 @@
 from xsbs.colors import colordict
 from xsbs.settings import PluginConfig
 from xsbs.players import player
+from xsbs.db import dbmanager
 import string
 
 config = PluginConfig('userprivilege')