Remove access level 700

otp/ai/GarbageLeakServerEventAggregator.py

@@ -1,43 +0,0 @@
-from direct.showbase.DirectObject import DirectObject
-from direct.showbase import GarbageReport
-
-class GarbageLeakServerEventAggregator(DirectObject):
-
-    def __init__(self, cr):
-        self.cr = cr
-        self._doLaterName = None
-        self._sentLeakDesc2num = {}
-        self._curLeakDesc2num = {}
-        self.accept(GarbageReport.GarbageCycleCountAnnounceEvent, self._handleCycleCounts)
-        return
-
-    def destroy(self):
-        self._stopSending()
-        self.ignoreAll()
-        del self.cr
-
-    def _handleCycleCounts(self, desc2num):
-        self._curLeakDesc2num = desc2num
-        self._startSending()
-
-    def _startSending(self):
-        if not self._doLaterName:
-            self._sendLeaks()
-            self._doLaterName = uniqueName('%s-sendGarbageLeakInfo' % self.__class__.__name__)
-            self.doMethodLater(60 * 60.0, self._sendLeaks, self._doLaterName)
-
-    def _stopSending(self):
-        if self._doLaterName:
-            self.removeTask(self._doLaterName)
-        self._doLaterName = None
-        return
-
-    def _sendLeaks(self, task = None):
-        for desc, curNum in self._curLeakDesc2num.iteritems():
-            self._sentLeakDesc2num.setdefault(desc, 0)
-            num = curNum - self._sentLeakDesc2num[desc]
-            if num > 0:
-                self._sentLeakDesc2num[desc] = curNum
-
-        if task:
-            return task.again

otp/ai/MagicWordGlobal.py

@@ -88,7 +88,6 @@ CATEGORY_MODERATOR = MagicWordCategory('Moderator', defaultAccess=300)
 CATEGORY_CREATIVE = MagicWordCategory('Creative', defaultAccess=400)
 CATEGORY_PROGRAMMER = MagicWordCategory('Programmer', defaultAccess=500)
 CATEGORY_ADMINISTRATOR = MagicWordCategory('Administrator', defaultAccess=600)
-CATEGORY_SYSTEM_ADMINISTRATOR = MagicWordCategory('System administrator', defaultAccess=700)
 
 MINIMUM_MAGICWORD_ACCESS = CATEGORY_COMMUNITY_MANAGER.defaultAccess
 

otp/avatar/DistributedPlayerAI.py

@@ -139,7 +139,7 @@ class DistributedPlayerAI(DistributedAvatarAI.DistributedAvatarAI, PlayerBase.Pl
         self.friendsList.append((friendId, friendCode))
 
 
-@magicWord(category=CATEGORY_SYSTEM_ADMINISTRATOR, types=[str])
+@magicWord(category=CATEGORY_ADMINISTRATOR, types=[str])
 def system(message):
     """
     Broadcast a <message> to the game server.
@@ -151,7 +151,7 @@ def system(message):
                                10, 1000000, [message])
     simbase.air.send(dg)
 
-@magicWord(category=CATEGORY_SYSTEM_ADMINISTRATOR, types=[int])
+@magicWord(category=CATEGORY_ADMINISTRATOR, types=[int])
 def maintenance(minutes):
     """
     Initiate the maintenance message sequence. It will last for the specified
@@ -209,14 +209,7 @@ def accessLevel(accessLevel, storage='PERSISTENT', showGM=1):
         'p': CATEGORY_PROGRAMMER.defaultAccess,
         'administrator': CATEGORY_ADMINISTRATOR.defaultAccess,
         'admin': CATEGORY_ADMINISTRATOR.defaultAccess,
-        'a': CATEGORY_ADMINISTRATOR.defaultAccess,
+        'a': CATEGORY_ADMINISTRATOR.defaultAccess
-        'systemadministrator': CATEGORY_SYSTEM_ADMINISTRATOR.defaultAccess,
-        'systemadmin': CATEGORY_SYSTEM_ADMINISTRATOR.defaultAccess,
-        'sysadministrator': CATEGORY_SYSTEM_ADMINISTRATOR.defaultAccess,
-        'sysadmin': CATEGORY_SYSTEM_ADMINISTRATOR.defaultAccess,
-        'system': CATEGORY_SYSTEM_ADMINISTRATOR.defaultAccess,
-        'sys': CATEGORY_SYSTEM_ADMINISTRATOR.defaultAccess,
-        's': CATEGORY_SYSTEM_ADMINISTRATOR.defaultAccess
     }
     try:
         accessLevel = int(accessLevel)

otp/distributed/OTPClientRepository.py

@@ -23,7 +23,6 @@ import sys
 import time
 import types
 
-from otp.ai.GarbageLeakServerEventAggregator import GarbageLeakServerEventAggregator
 from otp.avatar import Avatar
 from otp.avatar import DistributedAvatar
 from otp.avatar.DistributedPlayer import DistributedPlayer
@@ -1168,7 +1167,6 @@ class OTPClientRepository(ClientRepositoryBase):
         if self.music:
             self.music.stop()
             self.music = None
-        self.garbageLeakLogger = GarbageLeakServerEventAggregator(self)
         self.handler = self.handlePlayGame
         self.accept(self.gameDoneEvent, self.handleGameDone)
         base.transitions.noFade()
@@ -1208,8 +1206,6 @@ class OTPClientRepository(ClientRepositoryBase):
         self.playGame.exit()
         self.playGame.unload()
         self.ignore(self.gameDoneEvent)
-        self.garbageLeakLogger.destroy()
-        del self.garbageLeakLogger
         return
 
     @report(types=['args', 'deltaStamp'], dConfigParam='teleport')

toontown/effects/DistributedFireworkShowAI.py

@@ -36,7 +36,7 @@ class DistributedFireworkShowAI(DistributedObjectAI):
         pass
 
 
-@magicWord(category=CATEGORY_SYSTEM_ADMINISTRATOR, types=[str])
+@magicWord(category=CATEGORY_ADMINISTRATOR, types=[str])
 def fireworks(showName='july4'):
     """
     Starts a fireworks show on the AI server.

toontown/rpc/ToontownRPCHandler.py

@@ -37,7 +37,7 @@ class ToontownRPCHandler(ToontownRPCHandlerBase):
 
     # --- GENERAL ---
 
-    @rpcmethod(accessLevel=SYSTEM_ADMINISTRATOR)
+    @rpcmethod(accessLevel=ADMINISTRATOR)
     def rpc_queryObject(self, doId):
         """
         Summary:
@@ -69,7 +69,7 @@ class ToontownRPCHandler(ToontownRPCHandlerBase):
 
         return result
 
-    @rpcmethod(accessLevel=SYSTEM_ADMINISTRATOR)
+    @rpcmethod(accessLevel=ADMINISTRATOR)
     def rpc_updateObject(self, doId, dclassName, newFields, oldFields=None):
         """
         Summary:
@@ -119,7 +119,7 @@ class ToontownRPCHandler(ToontownRPCHandlerBase):
 
         return result[0]
 
-    @rpcmethod(accessLevel=SYSTEM_ADMINISTRATOR)
+    @rpcmethod(accessLevel=ADMINISTRATOR)
     def rpc_setField(self, doId, dclassName, fieldName, args=[]):
         """
         Summary:
@@ -152,7 +152,7 @@ class ToontownRPCHandler(ToontownRPCHandlerBase):
 
     # --- MESSAGES ---
 
-    @rpcmethod(accessLevel=SYSTEM_ADMINISTRATOR)
+    @rpcmethod(accessLevel=ADMINISTRATOR)
     def rpc_messageChannel(self, channel, message):
         """
         Summary:
@@ -169,7 +169,7 @@ class ToontownRPCHandler(ToontownRPCHandlerBase):
             channel, 1000000, [message])
         self.air.send(datagram)
 
-    @rpcmethod(accessLevel=SYSTEM_ADMINISTRATOR)
+    @rpcmethod(accessLevel=ADMINISTRATOR)
     def rpc_messageAll(self, message):
         """
         Summary: Broadcasts a [message] to all clients.
@@ -179,7 +179,7 @@ class ToontownRPCHandler(ToontownRPCHandlerBase):
         """
         self.rpc_messageChannel(10, message)
 
-    @rpcmethod(accessLevel=SYSTEM_ADMINISTRATOR)
+    @rpcmethod(accessLevel=ADMINISTRATOR)
     def rpc_messageShard(self, shardId, message):
         """
         Summary:
@@ -254,7 +254,7 @@ class ToontownRPCHandler(ToontownRPCHandlerBase):
 
     # --- KICKS ---
 
-    @rpcmethod(accessLevel=SYSTEM_ADMINISTRATOR)
+    @rpcmethod(accessLevel=ADMINISTRATOR)
     def rpc_kickChannel(self, channel, code, reason):
         """
         Summary:
@@ -272,7 +272,7 @@ class ToontownRPCHandler(ToontownRPCHandlerBase):
         datagram.addString(reason)
         self.air.send(datagram)
 
-    @rpcmethod(accessLevel=SYSTEM_ADMINISTRATOR)
+    @rpcmethod(accessLevel=ADMINISTRATOR)
     def rpc_kickAll(self, code, reason):
         """
         Summary: Kicks all clients.
@@ -283,7 +283,7 @@ class ToontownRPCHandler(ToontownRPCHandlerBase):
         """
         self.rpc_kickChannel(10, code, reason)
 
-    @rpcmethod(accessLevel=SYSTEM_ADMINISTRATOR)
+    @rpcmethod(accessLevel=ADMINISTRATOR)
     def rpc_kickShard(self, shardId, code, reason):
         """
         Summary: Kicks all clients under the provided [shardId].

toontown/rpc/ToontownRPCHandlerBase.py

@@ -13,8 +13,6 @@ MODERATOR = 300
 ARTIST = 400
 PROGRAMMER = 500
 ADMINISTRATOR = 600
-SYSTEM_ADMINISTRATOR = 700
-
 
 class RPCMethod:
     def __init__(self, accessLevel=UNKNOWN):

toontown/toon/DistributedToonAI.py

@@ -4651,7 +4651,7 @@ def gmIcon(accessLevel=None):
     invoker = spellbook.getInvoker()
     target = spellbook.getTarget()
     invokerAccess = spellbook.getInvokerAccess()
-    if invokerAccess != CATEGORY_SYSTEM_ADMINISTRATOR.defaultAccess:
+    if invokerAccess != CATEGORY_ADMINISTRATOR.defaultAccess:
         if accessLevel is not None:
             return "You must be of a higher access level to override your GM icon."
         target = spellbook.getInvoker()
@@ -4666,15 +4666,14 @@ def gmIcon(accessLevel=None):
         if accessLevel is None:
             accessLevel = target.getAdminAccess()
         if accessLevel != target.getGMType():
-            if invokerAccess != CATEGORY_SYSTEM_ADMINISTRATOR.defaultAccess:
+            if invokerAccess != CATEGORY_ADMINISTRATOR.defaultAccess:
                 accessLevel = target.getGMType()
         if accessLevel not in (0,
                                CATEGORY_COMMUNITY_MANAGER.defaultAccess,
                                CATEGORY_MODERATOR.defaultAccess,
                                CATEGORY_CREATIVE.defaultAccess,
                                CATEGORY_PROGRAMMER.defaultAccess,
-                               CATEGORY_ADMINISTRATOR.defaultAccess,
+                               CATEGORY_ADMINISTRATOR.defaultAccess):
-                               CATEGORY_SYSTEM_ADMINISTRATOR.defaultAccess):
             return 'Invalid access level!'
         target.b_setGM(accessLevel)
         if accessLevel == target.getAdminAccess():