Revert "Merge pull request #118 from Souzooka/major/isort"

This reverts commit 6e957c4bc2, reversing
changes made to a5ecbb8b1e.

.pre-commit-config.yaml

@@ -1,15 +0,0 @@
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
-repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
-    hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
--   repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-    -   id: isort
-        name: isort (python)

README.md

@@ -19,7 +19,7 @@ If you install Panda3D outside the default directory (or use the x86 installer),
 ## macOS 10.9+
 [Panda3D Wheel for macOS 10.9+ (Python3.9, x86_64)](https://drive.google.com/file/d/1_6WJxrkNfwisK5pe5ubJJy1psEp0IIft/view?usp=sharing)
 
-Installing the provided Panda3D wheel requires Python 3.9, which is not installed on your system by default whatsoever.  We recommend installing Python 3.9 through [Homebrew](https://brew.sh/) (Make sure that the xcode command line tools are installed first `xcode-select --install`):
+Installing the provided Panda3D wheel requires Python 3.9, which is not installed on your system by default whatsoever.  We recommend installing Python 3.9 through [Homebrew](https://brew.sh/) (Make sure that the xcode command line tools are installed first `xcode-select --install`): 
 ```shell
 $ brew install python@3.9
 ```

etc/Configrc.prc

@@ -56,7 +56,7 @@ default-directnotify-level info
 console-output 1
 
 # Panda3D/DirectX
-# Configure this true if you have a buggy graphics driver that doesn't correctly implement the third parameter, NumVertices, of DrawIndexedPrimitive().  In particular, the NVIDIA Quadro driver version 6.14.10.7184 seems to treat this as a maximum vertex index, rather than a delta between the maximum and minimum vertex index.  Turn this on if you are seeing stray triangles, or you are not seeing all of your triangles.  Enabling this should work around this bug, at the cost of some additional rendering overhead on the GPU.
+# Configure this true if you have a buggy graphics driver that doesn't correctly implement the third parameter, NumVertices, of DrawIndexedPrimitive().  In particular, the NVIDIA Quadro driver version 6.14.10.7184 seems to treat this as a maximum vertex index, rather than a delta between the maximum and minimum vertex index.  Turn this on if you are seeing stray triangles, or you are not seeing all of your triangles.  Enabling this should work around this bug, at the cost of some additional rendering overhead on the GPU. 
 dx-broken-max-index 1
 # Set this true to show ime texts on the chat panel and hide the IME default windows. This is a mechanism to work around DX8/9 interface.
 ime-aware 1

otp/ai/AIBase.py

@@ -1,23 +1,21 @@
-import gc
+from panda3d.core import *
+from direct.directnotify.DirectNotifyGlobal import *
+from direct.showbase import DConfig
+from direct.showbase.MessengerGlobal import *
+from direct.showbase.BulletinBoardGlobal import *
+from direct.task.TaskManagerGlobal import *
+from direct.showbase.JobManagerGlobal import *
+from direct.showbase.EventManagerGlobal import *
+from direct.showbase.PythonUtil import *
+from otp.otpbase import PythonUtil
+from direct.interval.IntervalManager import ivalMgr
+from direct.task import Task
+from direct.showbase import EventManager
+from direct.showbase import ExceptionVarDump
 import math
 import sys
 import time
-
-from panda3d.core import *
-
-from direct.directnotify.DirectNotifyGlobal import *
-from direct.interval.IntervalManager import ivalMgr
-from direct.showbase import DConfig, EventManager, ExceptionVarDump
-from direct.showbase.BulletinBoardGlobal import *
-from direct.showbase.EventManagerGlobal import *
-from direct.showbase.JobManagerGlobal import *
-from direct.showbase.MessengerGlobal import *
-from direct.showbase.PythonUtil import *
-from direct.task import Task
-from direct.task.TaskManagerGlobal import *
-
-from otp.otpbase import PythonUtil
-
+import gc
 
 class AIBase:
     notify = directNotify.newCategory('AIBase')

otp/ai/AIBaseGlobal.py

@@ -1,5 +1,4 @@
 from .AIBase import *
-
 __builtins__['simbase'] = AIBase()
 __builtins__['ostream'] = Notify.out()
 __builtins__['run'] = simbase.run
@@ -11,7 +10,6 @@ __builtins__['bboard'] = simbase.bboard
 __builtins__['config'] = simbase.config
 __builtins__['directNotify'] = directNotify
 from direct.showbase import Loader
-
 simbase.loader = Loader.Loader(simbase)
 __builtins__['loader'] = simbase.loader
 directNotify.setDconfigLevels()

otp/ai/AIMsgTypes.py

@@ -1,7 +1,5 @@
-from direct.showbase.PythonUtil import invertDictLossless
-
 from otp.distributed.OtpDoGlobals import *
-
+from direct.showbase.PythonUtil import invertDictLossless
 OTP_SERVER_ROOT_DO_ID = 4007
 CHANNEL_CLIENT_BROADCAST = 4014
 BAD_CHANNEL_ID = 0

otp/ai/AIZoneData.py

@@ -1,14 +1,10 @@
-import random
-
 from panda3d.core import *
-
-from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.distributed import ParentMgr
-from direct.showbase import LeakDetectors
+from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.task import Task
-
+from direct.showbase import LeakDetectors
 from otp.otpbase import OTPGlobals
-
+import random
 
 class AIZoneData:
     notify = directNotify.newCategory('AIZoneData')

otp/ai/BanManagerAI.py

@@ -1,13 +1,8 @@
+import urllib.request, urllib.parse, urllib.error
 import os
-import urllib.error
-import urllib.parse
-import urllib.request
-
 from panda3d.core import HTTPClient, Ramfile
-
 from direct.directnotify import DirectNotifyGlobal
 
-
 class BanManagerAI:
     notify = DirectNotifyGlobal.directNotify.newCategory('BanManagerAI')
     BanUrl = simbase.config.GetString('ban-base-url', 'http://vapps.disl.starwave.com:8005/dis-hold/action/event')

otp/ai/Barrier.py

@@ -1,10 +1,7 @@
-import random
-
-from direct.showbase import DirectObject
-from direct.task import Task
-
 from otp.ai.AIBase import *
-
+from direct.task import Task
+from direct.showbase import DirectObject
+import random
 
 class Barrier(DirectObject.DirectObject):
     notify = directNotify.newCategory('Barrier')

otp/ai/GarbageLeakServerEventAggregator.py

@@ -1,6 +1,5 @@
-from direct.showbase import GarbageReport
 from direct.showbase.DirectObject import DirectObject
-
+from direct.showbase import GarbageReport
 
 class GarbageLeakServerEventAggregator(DirectObject):
 

otp/ai/TimeManager.py

@@ -1,21 +1,18 @@
-import base64
-import os
-import re
-import sys
-import time
-
 from panda3d.core import *
-
-from direct.directnotify import DirectNotifyGlobal
-from direct.distributed import DistributedObject
-from direct.distributed.ClockDelta import *
-from direct.showbase import GarbageReport, PythonUtil
 from direct.showbase.DirectObject import *
+from direct.distributed.ClockDelta import *
 from direct.task import Task
-
+from direct.distributed import DistributedObject
+from direct.directnotify import DirectNotifyGlobal
 from otp.otpbase import OTPGlobals
+from direct.showbase import PythonUtil
 from otp.otpbase.PythonUtil import describeException
-
+from direct.showbase import GarbageReport
+import base64
+import time
+import os
+import sys
+import re
 
 class TimeManager(DistributedObject.DistributedObject):
     notify = DirectNotifyGlobal.directNotify.newCategory('TimeManager')

otp/avatar/Avatar.py

@@ -1,17 +1,15 @@
-import random
-
 from panda3d.core import *
-from panda3d.otp import (CFNoQuitButton, CFPageButton, CFQuitButton, CFSpeech, CFThought, CFTimeout, Nametag,
-                         NametagGroup)
-
+from panda3d.otp import Nametag, NametagGroup
+from panda3d.otp import CFSpeech, CFThought, CFTimeout, CFPageButton, CFNoQuitButton, CFQuitButton
+from otp.otpbase import OTPGlobals
+from otp.otpbase import OTPLocalizer
 from direct.actor.Actor import Actor
 from direct.directnotify import DirectNotifyGlobal
 from direct.distributed import ClockDelta
-
 from otp.avatar.ShadowCaster import ShadowCaster
-from otp.otpbase import OTPGlobals, OTPLocalizer, OTPRender
+import random
+from otp.otpbase import OTPRender
 from otp.otpbase.PythonUtil import recordCreationStack
-
 teleportNotify = DirectNotifyGlobal.directNotify.newCategory('Teleport')
 teleportNotify.showTime = True
 if ConfigVariableBool('want-teleport-debug', 1).value:

otp/avatar/AvatarDNA.py

@@ -1,11 +1,8 @@
-import random
-
 from panda3d.core import *
-
 from direct.directnotify.DirectNotifyGlobal import *
+import random
 from direct.distributed.PyDatagram import PyDatagram
 from direct.distributed.PyDatagramIterator import PyDatagramIterator
-
 notify = directNotify.newCategory('AvatarDNA')
 
 class AvatarDNA:

otp/avatar/AvatarDetail.py

@@ -1,8 +1,6 @@
 from direct.directnotify.DirectNotifyGlobal import directNotify
-
 from otp.avatar import Avatar
 
-
 class AvatarDetail:
     notify = directNotify.newCategory('AvatarDetail')
 

otp/avatar/AvatarPanel.py

@@ -1,11 +1,8 @@
 from panda3d.core import *
-
-from direct.distributed import DistributedObject
 from direct.gui.DirectGui import *
 from direct.showbase import DirectObject
-
 from . import Avatar
-
+from direct.distributed import DistributedObject
 
 class AvatarPanel(DirectObject.DirectObject):
     currentAvatarPanel = None

otp/avatar/DistributedAvatar.py

@@ -1,23 +1,20 @@
-import random
-import string
 import time
-
+import string
 from panda3d.core import *
-from panda3d.otp import Nametag
-
-from direct.actor.DistributedActor import DistributedActor
 from direct.distributed import DistributedNode
+from direct.actor.DistributedActor import DistributedActor
 from direct.interval.IntervalGlobal import *
-from direct.showbase import PythonUtil
 from direct.task import Task
-
-from otp.chat import ChatGarbler, ChatManager
-from otp.otpbase import OTPGlobals, OTPLocalizer
+from direct.showbase import PythonUtil
+from panda3d.otp import Nametag
+from otp.otpbase import OTPGlobals
+from otp.otpbase import OTPLocalizer
 from otp.speedchat import SCDecoders
-
-from . import AvatarDNA
+from otp.chat import ChatGarbler
+from otp.chat import ChatManager
+import random
 from .Avatar import Avatar
-
+from . import AvatarDNA
 
 class DistributedAvatar(DistributedActor, Avatar):
     HpTextGenerator = TextNode('HpTextGenerator')

otp/avatar/DistributedAvatarAI.py

@@ -1,10 +1,9 @@
-from direct.distributed import DistributedNodeAI
-from direct.fsm import ClassicFSM, State
-from direct.task import Task
-
 from otp.ai.AIBaseGlobal import *
 from otp.otpbase import OTPGlobals
-
+from direct.fsm import ClassicFSM
+from direct.fsm import State
+from direct.distributed import DistributedNodeAI
+from direct.task import Task
 
 class DistributedAvatarAI(DistributedNodeAI.DistributedNodeAI):
 

otp/avatar/DistributedAvatarUD.py

@@ -1,6 +1,5 @@
 from direct.directnotify import DirectNotifyGlobal
 from direct.distributed.DistributedObjectUD import DistributedObjectUD
 
-
 class DistributedAvatarUD(DistributedObjectUD):
     notify = DirectNotifyGlobal.directNotify.newCategory('DistributedAvatarUD')

otp/avatar/DistributedPlayer.py

@@ -1,17 +1,18 @@
 from panda3d.core import *
-from panda3d.otp import CFPageButton, CFQuicktalker, CFQuitButton, CFSpeech, CFThought, CFTimeout, WhisperPopup
-
-from otp.avatar import Avatar, DistributedAvatar, PlayerBase
-from otp.avatar.Avatar import teleportNotify
-from otp.chat import ChatGarbler, TalkAssistant
-from otp.distributed.TelemetryLimited import TelemetryLimited
-from otp.otpbase import OTPGlobals, OTPLocalizer
+from panda3d.otp import WhisperPopup
+from panda3d.otp import CFQuicktalker, CFPageButton, CFQuitButton, CFSpeech, CFThought, CFTimeout
+from otp.chat import ChatGarbler
+from otp.otpbase import OTPLocalizer
 from otp.speedchat import SCDecoders
-
+from otp.avatar import DistributedAvatar
+from otp.avatar import Avatar, PlayerBase
+from otp.chat import TalkAssistant
+from otp.otpbase import OTPGlobals
+from otp.avatar.Avatar import teleportNotify
+from otp.distributed.TelemetryLimited import TelemetryLimited
 if ConfigVariableBool('want-chatfilter-hacks', 0).value:
-    import os
-
     from otp.switchboard import badwordpy
+    import os
     badwordpy.init(os.environ.get('OTP') + '\\src\\switchboard\\', '')
 
 class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBase, TelemetryLimited):

otp/avatar/DistributedPlayerAI.py

@@ -1,11 +1,10 @@
 from direct.showbase import GarbageReport
-
 from otp.ai.AIBaseGlobal import *
-from otp.avatar import DistributedAvatarAI, PlayerBase
+from otp.avatar import DistributedAvatarAI
+from otp.avatar import PlayerBase
 from otp.distributed.ClsendTracker import ClsendTracker
 from otp.otpbase import OTPGlobals
 
-
 class DistributedPlayerAI(DistributedAvatarAI.DistributedAvatarAI, PlayerBase.PlayerBase, ClsendTracker):
 
     def __init__(self, air):

otp/avatar/Emote.py

@@ -1,6 +1,5 @@
 from otp.otpbase import OTPLocalizer
 
-
 class Emote:
     EmoteClear = -1
     EmoteEnableStateChanged = 'EmoteEnableStateChanged'

otp/avatar/LocalAvatar.py

@@ -1,27 +1,23 @@
-import math
-import random
-
 from panda3d.core import *
 from panda3d.otp import Nametag, WhisperPopup
-
+from direct.gui.DirectGui import *
+from direct.showbase.PythonUtil import *
+from direct.interval.IntervalGlobal import *
+from direct.showbase.InputStateGlobal import inputState
 from direct.controls import ControlManager
+from . import DistributedAvatar
+from direct.task import Task
+from otp.otpbase import OTPGlobals
+import math
+import random
+from direct.directnotify import DirectNotifyGlobal
+from direct.distributed import DistributedSmoothNode
+from otp.otpbase import OTPLocalizer
 from direct.controls.GhostWalker import GhostWalker
 from direct.controls.GravityWalker import GravityWalker
 from direct.controls.ObserverWalker import ObserverWalker
 from direct.controls.SwimWalker import SwimWalker
 from direct.controls.TwoDWalker import TwoDWalker
-from direct.directnotify import DirectNotifyGlobal
-from direct.distributed import DistributedSmoothNode
-from direct.gui.DirectGui import *
-from direct.interval.IntervalGlobal import *
-from direct.showbase.InputStateGlobal import inputState
-from direct.showbase.PythonUtil import *
-from direct.task import Task
-
-from otp.otpbase import OTPGlobals, OTPLocalizer
-
-from . import DistributedAvatar
-
 
 class LocalAvatar(DistributedAvatar.DistributedAvatar, DistributedSmoothNode.DistributedSmoothNode):
     notify = DirectNotifyGlobal.directNotify.newCategory('LocalAvatar')

otp/avatar/PositionExaminer.py

@@ -1,10 +1,7 @@
 from panda3d.core import *
-
 from direct.showbase.DirectObject import DirectObject
-
 from otp.otpbase import OTPGlobals
 
-
 class PositionExaminer(DirectObject, NodePath):
 
     def __init__(self):

otp/avatar/ShadowCaster.py

@@ -1,10 +1,8 @@
 from panda3d.core import *
-
+from panda3d.core import *
 from direct.directnotify import DirectNotifyGlobal
 from direct.showbase.ShadowPlacer import ShadowPlacer
-
 from otp.otpbase import OTPGlobals
-
 globalDropShadowFlag = 1
 
 def setGlobalDropShadowFlag(flag):

otp/avatar/SpeedMonitor.py

@@ -1,7 +1,6 @@
 from direct.showbase.PythonUtil import SerialNumGen
 from direct.task import Task
 
-
 class SpeedMonitor:
     notify = directNotify.newCategory('SpeedMonitor')
     SerialGen = SerialNumGen()

otp/chat/ChatGarbler.py

@@ -1,9 +1,7 @@
-import random
 import string
-
+import random
 from otp.otpbase import OTPLocalizer
 
-
 class ChatGarbler:
 
     def garble(self, avatar, message):

otp/chat/ChatGlobals.py

@@ -1,5 +1,4 @@
 import string
-
 NORMAL_CHAT = 1
 WHISPER_CHAT = 2
 GUILD_CHAT = 3

otp/chat/ChatInputNormal.py

@@ -1,12 +1,9 @@
-import sys
-
-from panda3d.core import *
-
-from direct.gui.DirectGui import *
 from direct.showbase import DirectObject
-
-from otp.otpbase import OTPGlobals, OTPLocalizer
-
+from otp.otpbase import OTPGlobals
+import sys
+from direct.gui.DirectGui import *
+from panda3d.core import *
+from otp.otpbase import OTPLocalizer
 
 class ChatInputNormal(DirectObject.DirectObject):
     ExecNamespace = None

otp/chat/ChatInputTyped.py

@@ -1,12 +1,9 @@
-import sys
-
-from panda3d.core import *
-
-from direct.gui.DirectGui import *
 from direct.showbase import DirectObject
-
-from otp.otpbase import OTPGlobals, OTPLocalizer
-
+from otp.otpbase import OTPGlobals
+import sys
+from direct.gui.DirectGui import *
+from panda3d.core import *
+from otp.otpbase import OTPLocalizer
 
 class ChatInputTyped(DirectObject.DirectObject):
     ExecNamespace = None

otp/chat/ChatInputWhiteListFrame.py

@@ -1,16 +1,13 @@
+from direct.fsm import FSM
+from otp.otpbase import OTPGlobals
 import sys
-
+from direct.directnotify import DirectNotifyGlobal
+from direct.gui.DirectGui import *
 from panda3d.core import *
 from panda3d.otp import *
-
-from direct.directnotify import DirectNotifyGlobal
-from direct.fsm import FSM
-from direct.gui.DirectGui import *
+from otp.otpbase import OTPLocalizer
 from direct.task import Task
-
 from otp.chat.ChatInputTyped import ChatInputTyped
-from otp.otpbase import OTPGlobals, OTPLocalizer
-
 
 class ChatInputWhiteListFrame(FSM.FSM, DirectFrame):
     notify = DirectNotifyGlobal.directNotify.newCategory('ChatInputWhiteList')

otp/chat/ChatManager.py

@@ -1,15 +1,14 @@
 import string
-
-from panda3d.core import *
-
-from direct.directnotify import DirectNotifyGlobal
-from direct.fsm import ClassicFSM, State
-from direct.gui.DirectGui import *
 from direct.showbase import DirectObject
-
-from otp.login import LeaveToPayDialog, PrivacyPolicyPanel, SecretFriendsInfoPanel
+from direct.fsm import ClassicFSM
+from direct.fsm import State
+from otp.login import SecretFriendsInfoPanel
+from otp.login import PrivacyPolicyPanel
 from otp.otpbase import OTPLocalizer
-
+from direct.directnotify import DirectNotifyGlobal
+from otp.login import LeaveToPayDialog
+from direct.gui.DirectGui import *
+from panda3d.core import *
 ChatEvent = 'ChatEvent'
 NormalChatEvent = 'NormalChatEvent'
 SCChatEvent = 'SCChatEvent'

otp/chat/TalkAssistant.py

@@ -1,19 +1,16 @@
 import sys
-import time
-
-from panda3d.core import *
-from panda3d.otp import CFSpeech, CFThought, CFTimeout
-
-from direct.directnotify import DirectNotifyGlobal
 from direct.showbase import DirectObject
-
-from otp.chat.ChatGlobals import *
-from otp.chat.TalkGlobals import *
-from otp.chat.TalkHandle import TalkHandle
-from otp.chat.TalkMessage import TalkMessage
-from otp.otpbase import OTPGlobals, OTPLocalizer
+from otp.otpbase import OTPLocalizer
+from direct.directnotify import DirectNotifyGlobal
+from otp.otpbase import OTPGlobals
 from otp.speedchat import SCDecoders
-
+from panda3d.core import *
+from otp.chat.TalkMessage import TalkMessage
+from otp.chat.TalkHandle import TalkHandle
+import time
+from otp.chat.TalkGlobals import *
+from otp.chat.ChatGlobals import *
+from panda3d.otp import CFSpeech, CFTimeout, CFThought
 ThoughtPrefix = '.'
 
 class TalkAssistant(DirectObject.DirectObject):

otp/chat/TalkHandle.py

@@ -1,6 +1,5 @@
 from otp.avatar.AvatarHandle import AvatarHandle
 
-
 class TalkHandle(AvatarHandle):
 
     def __init__(self, doId, message):

otp/chat/WhiteList.py

@@ -1,6 +1,5 @@
 from bisect import bisect_left
 
-
 class WhiteList:
 
     def __init__(self, wordlist):

otp/distributed/Account.py

@@ -1,6 +1,5 @@
 from direct.distributed import DistributedObject
 
-
 class Account(DistributedObject.DistributedObject):
 
     def __init__(self, cr):

otp/distributed/CentralLogger.py

@@ -1,5 +1,4 @@
 from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal
-
 REPORT_PLAYER = 'REPORT_PLAYER'
 ReportFoulLanguage = 'MODERATION_FOUL_LANGUAGE'
 ReportPersonalInfo = 'MODERATION_PERSONAL_INFO'

otp/distributed/ClsendTracker.py

@@ -1,9 +1,6 @@
-import random
-
 from panda3d.core import StringStream
-
 from direct.distributed.PyDatagram import PyDatagram
-
+import random
 
 class ClsendTracker:
     clsendNotify = directNotify.newCategory('clsend')

otp/distributed/DistributedDirectory.py

@@ -1,5 +1,4 @@
 from direct.distributed.DistributedObject import DistributedObject
 
-
 class DistributedDirectory(DistributedObject):
     pass

otp/distributed/DistributedDistrict.py

@@ -1,7 +1,6 @@
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.distributed.DistributedObject import DistributedObject
 
-
 class DistributedDistrict(DistributedObject):
     notify = directNotify.newCategory('DistributedDistrict')
     neverDisable = 1

otp/distributed/DistributedTestObject.py

@@ -1,6 +1,5 @@
 from direct.distributed import DistributedObject
 
-
 class DistributedTestObject(DistributedObject.DistributedObject):
 
     def setRequiredField(self, r):

otp/distributed/GameServerTestSuite.py

@@ -1,7 +1,6 @@
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.showbase import DirectObject, TaskThreaded
 
-
 class GameServerTestSuite(DirectObject.DirectObject, TaskThreaded.TaskThreaded):
     notify = directNotify.newCategory('GarbageReport')
 

otp/distributed/OTPClientRepository.py

@@ -1,41 +1,45 @@
-import gc
-import os
-import random
 import sys
 import time
-from enum import IntEnum
-
+import random
+import gc
+import os
 from panda3d.core import *
-
+from direct.gui.DirectGui import *
+from otp.distributed.OtpDoGlobals import *
+from direct.interval.IntervalGlobal import ivalMgr
 from direct.directnotify.DirectNotifyGlobal import directNotify
-from direct.distributed import DistributedSmoothNode
 from direct.distributed.ClientRepositoryBase import ClientRepositoryBase
-from direct.distributed.PyDatagram import PyDatagram
 from direct.fsm.ClassicFSM import ClassicFSM
 from direct.fsm.State import State
-from direct.gui.DirectGui import *
-from direct.interval.IntervalGlobal import ivalMgr
-from direct.showbase import GarbageReport, LeakDetectors, MessengerLeakDetector, PythonUtil
-from direct.showbase.ContainerLeakDetector import ContainerLeakDetector
-from direct.showbase.GarbageReportScheduler import GarbageReportScheduler
 from direct.task import Task
-
-from otp.ai.GarbageLeakServerEventAggregator import GarbageLeakServerEventAggregator
+from direct.distributed import DistributedSmoothNode
+from direct.showbase import PythonUtil, GarbageReport
+from direct.showbase.ContainerLeakDetector import ContainerLeakDetector
+from direct.showbase import MessengerLeakDetector
+from direct.showbase.GarbageReportScheduler import GarbageReportScheduler
+from direct.showbase import LeakDetectors
+from direct.distributed.PyDatagram import PyDatagram
 from otp.avatar.DistributedPlayer import DistributedPlayer
-from otp.distributed import OtpDoGlobals
-from otp.distributed.OtpDoGlobals import *
-from otp.distributed.TelemetryLimiter import TelemetryLimiter
-from otp.login import (HTTPUtil, LoginAstronAccount, LoginGoAccount, LoginGSAccount, LoginScreen, LoginTTAccount,
-                       LoginTTSpecificDevAccount)
+from otp.login import LoginTTSpecificDevAccount
 from otp.login.CreateAccountScreen import CreateAccountScreen
-from otp.login.LoginDISLTokenAccount import LoginDISLTokenAccount
-from otp.login.LoginWebPlayTokenAccount import LoginWebPlayTokenAccount
-from otp.otpbase import OTPGlobals, OTPLauncherGlobals, OTPLocalizer
+from otp.login import LoginScreen
 from otp.otpgui import OTPDialog
+from otp.otpbase import OTPLocalizer
+from otp.login import LoginGSAccount
+from otp.login import LoginGoAccount
+from otp.login.LoginWebPlayTokenAccount import LoginWebPlayTokenAccount
+from otp.login.LoginDISLTokenAccount import LoginDISLTokenAccount
+from otp.login import LoginTTAccount
+from otp.login import LoginAstronAccount
+from otp.login import HTTPUtil
+from otp.otpbase import OTPGlobals
+from otp.otpbase import OTPLauncherGlobals
 from otp.uberdog import OtpAvatarManager
-
+from otp.distributed import OtpDoGlobals
+from otp.distributed.TelemetryLimiter import TelemetryLimiter
+from otp.ai.GarbageLeakServerEventAggregator import GarbageLeakServerEventAggregator
 from .PotentialAvatar import PotentialAvatar
-
+from enum import IntEnum
 
 class OTPClientRepository(ClientRepositoryBase):
     notify = directNotify.newCategory('OTPClientRepository')

otp/distributed/OTPInternalRepository.py

@@ -1,9 +1,10 @@
 from direct.directnotify import DirectNotifyGlobal
 from direct.distributed.AstronInternalRepository import AstronInternalRepository
-from direct.distributed.MsgTypes import *
 from direct.distributed.PyDatagram import *
+from direct.distributed.MsgTypes import *
 from direct.showbase.PythonUtil import makeList
 
+
 # TODO: Remove Astron dependence.
 
 class OTPInternalRepository(AstronInternalRepository):
@@ -42,7 +43,7 @@ class OTPInternalRepository(AstronInternalRepository):
             dg.addUint16(fieldId)
 
         self.send(dg)
-
+    
     def _getMsgName(self, msgId):
         # TODO: Remove Astron dependence.
         return makeList(MsgId2Names.get(msgId, f'UNKNOWN MESSAGE: {msgId}'))[0]

otp/distributed/ObjectServer.py

@@ -1,7 +1,6 @@
 from direct.directnotify import DirectNotifyGlobal
 from direct.distributed import DistributedObject
 
-
 class ObjectServer(DistributedObject.DistributedObject):
     notify = DirectNotifyGlobal.directNotify.newCategory('ObjectServer')
 

otp/distributed/OtpDoGlobals.py

@@ -1,5 +1,4 @@
 from direct.distributed.MsgTypes import *
-
 OTP_DO_ID_SERVER_ROOT = 4007
 OTP_DO_ID_FRIEND_MANAGER = 4501
 OTP_DO_ID_LEADERBOARD_MANAGER = 4502

otp/distributed/TelemetryLimiter.py

@@ -1,8 +1,6 @@
 from direct.showbase.DirectObject import DirectObject
-from direct.task.Task import Task
-
 from otp.avatar.DistributedPlayer import DistributedPlayer
-
+from direct.task.Task import Task
 
 class TelemetryLimiter(DirectObject):
     TaskName = 'TelemetryLimiterEnforce'

otp/friends/AvatarFriendInfo.py

@@ -1,6 +1,5 @@
 from otp.avatar.AvatarHandle import AvatarHandle
 
-
 class AvatarFriendInfo(AvatarHandle):
 
     def __init__(self, avatarName = '', playerName = '', playerId = 0, onlineYesNo = 0, openChatEnabledYesNo = 0, openChatFriendshipYesNo = 0, wlChatEnabledYesNo = 0):

otp/friends/AvatarFriendsManager.py

@@ -1,9 +1,8 @@
-from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal
-
-from otp.otpbase import OTPGlobals, OTPLocalizer
+from direct.directnotify.DirectNotifyGlobal import directNotify
 from otp.uberdog.RejectCode import RejectCode
-
+from otp.otpbase import OTPGlobals
+from otp.otpbase import OTPLocalizer
 
 class AvatarFriendsManager(DistributedObjectGlobal):
     notify = directNotify.newCategory('AvatarFriendsManager')

otp/friends/AvatarFriendsManagerUD.py

@@ -1,6 +1,5 @@
 from direct.directnotify import DirectNotifyGlobal
 from direct.distributed.DistributedObjectUD import DistributedObjectUD
 
-
 class AvatarFriendsManagerUD(DistributedObjectUD):
     notify = DirectNotifyGlobal.directNotify.newCategory('AvatarFriendsManagerUD')

otp/friends/FriendInfo.py

@@ -1,6 +1,5 @@
 from otp.avatar.AvatarHandle import AvatarHandle
 
-
 class FriendInfo(AvatarHandle):
 
     def __init__(self, avatarName = '', playerName = '', onlineYesNo = 0, openChatEnabledYesNo = 0, openChatFriendshipYesNo = 0, wlChatEnabledYesNo = 0, location = '', sublocation = '', timestamp = 0, avatarId = 0, friendPrivs = 0, tokenPrivs = 0):

otp/friends/FriendManager.py

@@ -1,11 +1,8 @@
 from panda3d.core import *
-
-from direct.directnotify import DirectNotifyGlobal
 from direct.distributed import DistributedObject
-
+from direct.directnotify import DirectNotifyGlobal
 from otp.otpbase import OTPGlobals
 
-
 class FriendManager(DistributedObject.DistributedObject):
     notify = DirectNotifyGlobal.directNotify.newCategory('FriendManager')
     neverDisable = 1

otp/friends/FriendManagerAI.py

@@ -1,6 +1,5 @@
 from direct.directnotify import DirectNotifyGlobal
 from direct.distributed.DistributedObjectAI import DistributedObjectAI
 
-
 class FriendManagerAI(DistributedObjectAI):
     notify = DirectNotifyGlobal.directNotify.newCategory('FriendManagerAI')

otp/friends/FriendSecret.py

@@ -1,13 +1,11 @@
 from panda3d.core import *
 from panda3d.otp import *
-
+from direct.gui.DirectGui import *
 from direct.directnotify import DirectNotifyGlobal
 from direct.fsm import StateData
-from direct.gui.DirectGui import *
-
-from otp.otpbase import OTPGlobals, OTPLocalizer
+from otp.otpbase import OTPLocalizer
+from otp.otpbase import OTPGlobals
 from otp.uberdog import RejectCode
-
 globalFriendSecret = None
 AccountSecret = 0
 AvatarSecret = 1

otp/friends/GuildManager.py

@@ -1,18 +1,16 @@
-from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal
-
-from otp.ai import AIInterestHandles
-from otp.avatar.AvatarHandle import AvatarHandle
+from direct.directnotify.DirectNotifyGlobal import directNotify
 from otp.distributed import OtpDoGlobals
-from otp.otpbase import OTPGlobals, OTPLocalizer
-
+from otp.otpbase import OTPLocalizer
+from otp.otpbase import OTPGlobals
+from otp.avatar.AvatarHandle import AvatarHandle
+from otp.ai import AIInterestHandles
 GUILDRANK_VETERAN = 4
 GUILDRANK_GM = 3
 GUILDRANK_OFFICER = 2
 GUILDRANK_MEMBER = 1
 import queue
 
-
 class GuildMemberInfo(AvatarHandle):
 
     def __init__(self, name, isOnline, rank, bandId):

otp/friends/GuildManagerAI.py

@@ -1,6 +1,5 @@
 from direct.directnotify import DirectNotifyGlobal
 from direct.distributed.DistributedObjectAI import DistributedObjectAI
 
-
 class GuildManagerAI(DistributedObjectAI):
     notify = DirectNotifyGlobal.directNotify.newCategory('GuildManagerAI')

otp/friends/GuildManagerUD.py

@@ -1,6 +1,5 @@
 from direct.directnotify import DirectNotifyGlobal
 from direct.distributed.DistributedObjectUD import DistributedObjectUD
 
-
 class GuildManagerUD(DistributedObjectUD):
     notify = DirectNotifyGlobal.directNotify.newCategory('GuildManagerUD')

otp/friends/PlayerFriendsManager.py

@@ -1,10 +1,8 @@
-from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal
-
+from direct.directnotify.DirectNotifyGlobal import directNotify
+from otp.otpbase import OTPGlobals
 from otp.avatar.Avatar import teleportNotify
 from otp.friends import FriendResponseCodes
-from otp.otpbase import OTPGlobals
-
 
 class PlayerFriendsManager(DistributedObjectGlobal):
     notify = directNotify.newCategory('PlayerFriendsManager')

otp/friends/PlayerFriendsManagerUD.py

@@ -1,6 +1,5 @@
 from direct.directnotify import DirectNotifyGlobal
 from direct.distributed.DistributedObjectUD import DistributedObjectUD
 
-
 class PlayerFriendsManagerUD(DistributedObjectUD):
     notify = DirectNotifyGlobal.directNotify.newCategory('PlayerFriendsManagerUD')

otp/launcher/DownloadWatcher.py

@@ -1,11 +1,8 @@
-from panda3d.core import *
-
-from direct.gui.DirectGui import *
-from direct.showbase.DirectObject import DirectObject
 from direct.task import Task
-
 from otp.otpbase import OTPLocalizer
-
+from direct.gui.DirectGui import *
+from panda3d.core import *
+from direct.showbase.DirectObject import DirectObject
 
 class DownloadWatcher(DirectObject):
 

otp/launcher/DummyLauncherBase.py

@@ -1,9 +1,7 @@
 from panda3d.core import *
-
 from direct.showbase.MessengerGlobal import *
-from direct.task.Task import Task
 from direct.task.TaskManagerGlobal import *
-
+from direct.task.Task import Task
 
 class DummyLauncherBase:
 

otp/launcher/LauncherBase.py

@@ -1,15 +1,12 @@
-import builtins
-import os
 import sys
+import os
 import time
-
+import builtins
 from panda3d.core import *
-
-from direct.directnotify.DirectNotifyGlobal import *
 from direct.showbase import DConfig
 from direct.showbase.DirectObject import DirectObject
 from direct.task.MiniTask import MiniTaskManager
-
+from direct.directnotify.DirectNotifyGlobal import *
 
 class LogAndOutput:
 

otp/level/AmbientSound.py

@@ -1,9 +1,6 @@
-import random
-
 from direct.interval.IntervalGlobal import *
-
 from . import BasicEntities
-
+import random
 
 class AmbientSound(BasicEntities.NodePathEntity):
 

otp/level/BasicEntities.py

@@ -1,8 +1,7 @@
+from . import Entity
+from . import DistributedEntity
 from panda3d.core import NodePath
 
-from . import DistributedEntity, Entity
-
-
 class NodePathEntityBase:
 
     def initNodePathAttribs(self, doReparent = 1):

otp/level/CollisionSolidEntity.py

@@ -1,12 +1,8 @@
 from panda3d.core import *
-
-from direct.directnotify import DirectNotifyGlobal
-
 from otp.otpbase import OTPGlobals
-
+from direct.directnotify import DirectNotifyGlobal
 from . import BasicEntities
 
-
 class CollisionSolidEntity(BasicEntities.NodePathEntity):
     notify = DirectNotifyGlobal.directNotify.newCategory('CollisionSolidEntity')
 

otp/level/CutScene.py

@@ -1,15 +1,13 @@
-from panda3d.core import *
-
-from direct.directnotify import DirectNotifyGlobal
-from direct.distributed.ClockDelta import *
-from direct.fsm import ClassicFSM
-from direct.interval.IntervalGlobal import *
 from direct.showbase import DirectObject
-
-from toontown.toonbase import ToontownGlobals
-
+from direct.directnotify import DirectNotifyGlobal
 from . import BasicEntities
-
+from panda3d.core import *
+from panda3d.core import *
+from direct.interval.IntervalGlobal import *
+from direct.distributed.ClockDelta import *
+from toontown.toonbase import ToontownGlobals
+from direct.directnotify import DirectNotifyGlobal
+from direct.fsm import ClassicFSM
 
 def nothing(self, track, subjectNodePath, duration):
     return track

otp/level/DistributedEntity.py

@@ -1,8 +1,6 @@
-from direct.directnotify import DirectNotifyGlobal
 from direct.distributed import DistributedObject
-
 from . import Entity
-
+from direct.directnotify import DirectNotifyGlobal
 
 class DistributedEntity(DistributedObject.DistributedObject, Entity.Entity):
     notify = DirectNotifyGlobal.directNotify.newCategory('DistributedEntity')

otp/level/DistributedEntityAI.py

@@ -1,8 +1,6 @@
-from direct.directnotify import DirectNotifyGlobal
 from direct.distributed import DistributedObjectAI
-
 from . import Entity
-
+from direct.directnotify import DirectNotifyGlobal
 
 class DistributedEntityAI(DistributedObjectAI.DistributedObjectAI, Entity.Entity):
     notify = DirectNotifyGlobal.directNotify.newCategory('DistributedEntityAI')

otp/level/DistributedInteractiveEntity.py

@@ -1,12 +1,9 @@
 from panda3d.core import *
-
-from direct.directnotify import DirectNotifyGlobal
 from direct.distributed.ClockDelta import *
+from direct.directnotify import DirectNotifyGlobal
 from direct.fsm import ClassicFSM
-
 from . import DistributedEntity
 
-
 class DistributedInteractiveEntity(DistributedEntity.DistributedEntity):
     notify = DirectNotifyGlobal.directNotify.newCategory('DistributedInteractiveEntity')
 

otp/level/DistributedInteractiveEntityAI.py

@@ -1,6 +1,5 @@
 from direct.directnotify import DirectNotifyGlobal
 from direct.distributed.DistributedObjectAI import DistributedObjectAI
 
-
 class DistributedInteractiveEntityAI(DistributedObjectAI):
     notify = DirectNotifyGlobal.directNotify.newCategory('DistributedInteractiveEntityAI')

otp/level/DistributedLevel.py

@@ -1,22 +1,19 @@
-import random
-
-from panda3d.core import *
-
-from direct.directnotify import DirectNotifyGlobal
-from direct.distributed import DistributedObject
 from direct.distributed.ClockDelta import *
-from direct.gui import OnscreenText
+from panda3d.core import *
+from direct.showbase.PythonUtil import Functor, sameElements, list2dict, uniqueElements
 from direct.interval.IntervalGlobal import *
-from direct.showbase.PythonUtil import Functor, list2dict, sameElements, uniqueElements
-from direct.task import Task
-
-from otp.otpbase import OTPGlobals
-
 from toontown.distributed.ToontownMsgTypes import *
 from toontown.toonbase import ToontownGlobals
-
-from . import EntityCreator, Level, LevelConstants, LevelUtil
-
+from otp.otpbase import OTPGlobals
+from direct.distributed import DistributedObject
+from . import Level
+from . import LevelConstants
+from direct.directnotify import DirectNotifyGlobal
+from . import EntityCreator
+from direct.gui import OnscreenText
+from direct.task import Task
+from . import LevelUtil
+import random
 
 class DistributedLevel(DistributedObject.DistributedObject, Level.Level):
     notify = DirectNotifyGlobal.directNotify.newCategory('DistributedLevel')

otp/level/DistributedLevelAI.py

@@ -1,14 +1,11 @@
 from panda3d.core import *
-
-from direct.directnotify import DirectNotifyGlobal
-from direct.distributed import DistributedObjectAI
-from direct.distributed.ClockDelta import *
-from direct.showbase.PythonUtil import Functor, weightedChoice
-
 from otp.ai.AIBaseGlobal import *
-
-from . import EntityCreatorAI, Level
-
+from direct.distributed.ClockDelta import *
+from direct.distributed import DistributedObjectAI
+from . import Level
+from direct.directnotify import DirectNotifyGlobal
+from . import EntityCreatorAI
+from direct.showbase.PythonUtil import Functor, weightedChoice
 
 class DistributedLevelAI(DistributedObjectAI.DistributedObjectAI, Level.Level):
     notify = DirectNotifyGlobal.directNotify.newCategory('DistributedLevelAI')

otp/level/EditMgr.py

@@ -1,5 +1,4 @@
 from . import EditMgrBase
 
-
 class EditMgr(EditMgrBase.EditMgrBase):
     pass

otp/level/EditMgrAI.py

@@ -1,8 +1,6 @@
 from . import EditMgrBase
-
 if __dev__:
     from direct.showbase.PythonUtil import list2dict
-
     from . import EditorGlobals
 
 class EditMgrAI(EditMgrBase.EditMgrBase):

otp/level/EditMgrBase.py

@@ -1,7 +1,5 @@
-from direct.directnotify import DirectNotifyGlobal
-
 from . import Entity
-
+from direct.directnotify import DirectNotifyGlobal
 
 class EditMgrBase(Entity.Entity):
     notify = DirectNotifyGlobal.directNotify.newCategory('EditMgr')

otp/level/EditorGlobals.py

@@ -1,5 +1,4 @@
 from direct.showbase.PythonUtil import uniqueElements
-
 EditTargetPostName = 'inGameEditTarget'
 EntIdRange = 10000
 username2entIdBase = {'darren': 1 * EntIdRange,

otp/level/Entity.py

@@ -1,7 +1,6 @@
-from direct.directnotify import DirectNotifyGlobal
 from direct.showbase.DirectObject import DirectObject
 from direct.showbase.PythonUtil import lineInfo
-
+from direct.directnotify import DirectNotifyGlobal
 
 class Entity(DirectObject):
     notify = DirectNotifyGlobal.directNotify.newCategory('Entity')

otp/level/EntityCreator.py

@@ -1,8 +1,19 @@
+from . import CutScene
+from . import EntityCreatorBase
+from . import BasicEntities
 from direct.directnotify import DirectNotifyGlobal
-
-from . import (AmbientSound, BasicEntities, CollisionSolidEntity, CutScene, EditMgr, EntityCreatorBase, EntrancePoint,
-               LevelMgr, LocatorEntity, LogicGate, ModelEntity, PathEntity, PropSpinner, VisibilityExtender, ZoneEntity)
-
+from . import EditMgr
+from . import EntrancePoint
+from . import LevelMgr
+from . import LogicGate
+from . import ZoneEntity
+from . import ModelEntity
+from . import PathEntity
+from . import VisibilityExtender
+from . import PropSpinner
+from . import AmbientSound
+from . import LocatorEntity
+from . import CollisionSolidEntity
 
 def nothing(*args):
     return 'nothing'

otp/level/EntityCreatorAI.py

@@ -1,8 +1,10 @@
+from . import EntityCreatorBase
+from . import LogicGate
+from . import EditMgrAI
+from . import LevelMgrAI
+from . import ZoneEntityAI
 from direct.showbase.PythonUtil import Functor
 
-from . import EditMgrAI, EntityCreatorBase, LevelMgrAI, LogicGate, ZoneEntityAI
-
-
 def createDistributedEntity(AIclass, level, entId, zoneId):
     ent = AIclass(level, entId)
     ent.generateWithRequired(zoneId)

otp/level/EntityCreatorBase.py

@@ -1,6 +1,5 @@
 from direct.directnotify import DirectNotifyGlobal
 
-
 class EntityCreatorBase:
     notify = DirectNotifyGlobal.directNotify.newCategory('EntityCreator')
 

otp/level/EntityStateVarSet.py

@@ -1,9 +1,7 @@
 from direct.fsm.StatePush import StateVar
 from direct.showbase.PythonUtil import getSetterName
-
 from otp.level.Entity import Entity
 
-
 class EntityStateVarSet(Entity):
 
     def __init__(self, entType):

otp/level/EntityTypeDesc.py

@@ -1,8 +1,6 @@
 from direct.directnotify import DirectNotifyGlobal
-from direct.showbase.PythonUtil import mostDerivedLast
-
 from . import AttribDesc
-
+from direct.showbase.PythonUtil import mostDerivedLast
 
 class EntityTypeDesc:
     notify = DirectNotifyGlobal.directNotify.newCategory('EntityTypeDesc')

otp/level/EntityTypeRegistry.py

@@ -1,15 +1,12 @@
-import importlib
+from panda3d.core import *
+from direct.directnotify import DirectNotifyGlobal
+import types
+from . import AttribDesc
+from . import EntityTypeDesc
+from direct.showbase.PythonUtil import mostDerivedLast
 import os
 import string
-import types
-
-from panda3d.core import *
-
-from direct.directnotify import DirectNotifyGlobal
-from direct.showbase.PythonUtil import mostDerivedLast
-
-from . import AttribDesc, EntityTypeDesc
-
+import importlib
 
 class EntityTypeRegistry:
     notify = DirectNotifyGlobal.directNotify.newCategory('EntityTypeRegistry')

otp/level/EntityTypes.py

@@ -1,7 +1,5 @@
-from toontown.coghq.SpecImports import *
-
 from .EntityTypeDesc import EntityTypeDesc
-
+from toontown.coghq.SpecImports import *
 
 class Entity(EntityTypeDesc):
     abstract = 1

otp/level/EntrancePoint.py

@@ -1,10 +1,7 @@
-from direct.directnotify import DirectNotifyGlobal
-
 from toontown.toonbase.ToontownGlobals import *
-
+from direct.directnotify import DirectNotifyGlobal
 from . import BasicEntities
 
-
 class EntrancePoint(BasicEntities.NodePathEntity):
 
     def __init__(self, level, entId):

otp/level/Level.py

@@ -1,11 +1,8 @@
-import string
-import types
-
 from direct.directnotify import DirectNotifyGlobal
-from direct.showbase.PythonUtil import lineInfo, uniqueElements
-
+import string
 from . import LevelConstants
-
+from direct.showbase.PythonUtil import lineInfo, uniqueElements
+import types
 
 class Level:
     notify = DirectNotifyGlobal.directNotify.newCategory('Level')

otp/level/LevelMgr.py

@@ -1,8 +1,6 @@
 from direct.showbase.PythonUtil import Functor
-
 from . import LevelMgrBase
 
-
 class LevelMgr(LevelMgrBase.LevelMgrBase):
 
     def __init__(self, level, entId):

otp/level/LevelMgrAI.py

@@ -1,8 +1,6 @@
 from direct.showbase.PythonUtil import Functor
-
 from . import LevelMgrBase
 
-
 class LevelMgrAI(LevelMgrBase.LevelMgrBase):
 
     def __init__(self, level, entId):

otp/level/LevelMgrBase.py

@@ -1,6 +1,5 @@
 from . import Entity
 
-
 class LevelMgrBase(Entity.Entity):
 
     def __init__(self, level, entId):

otp/level/LevelSpec.py

@@ -1,14 +1,10 @@
-import importlib
-import string
-import types
-
 from panda3d.core import *
-
 from direct.directnotify import DirectNotifyGlobal
 from direct.showbase.PythonUtil import list2dict, uniqueElements
-
+import string
 from . import LevelConstants
-
+import types
+import importlib
 if __dev__:
     import os
 
@@ -39,7 +35,8 @@ class LevelSpec:
         self.setScenario(scenario)
         if __dev__:
             if newSpec:
-                from . import EntityTypeRegistry, EntityTypes
+                from . import EntityTypes
+                from . import EntityTypeRegistry
                 etr = EntityTypeRegistry.EntityTypeRegistry(EntityTypes)
                 self.setEntityTypeReg(etr)
                 entId = LevelConstants.UberZoneEntId

otp/level/LevelUtil.py

@@ -1,8 +1,6 @@
 import string
-
 from . import LevelConstants
 
-
 def getZoneNum2Node(levelModel, logFunc = lambda str: str):
 
     def findNumberedNodes(baseString, model, caseInsens = 1):

otp/level/LocatorEntity.py

@@ -1,10 +1,7 @@
+from . import Entity, BasicEntities
 from panda3d.core import NodePath
-
 from direct.directnotify import DirectNotifyGlobal
 
-from . import BasicEntities, Entity
-
-
 class LocatorEntity(Entity.Entity, NodePath):
     notify = DirectNotifyGlobal.directNotify.newCategory('LocatorEntity')
 

otp/level/LogicGate.py

@@ -1,9 +1,7 @@
-from direct.directnotify import DirectNotifyGlobal
 from direct.showbase import DirectObject
-
+from direct.directnotify import DirectNotifyGlobal
 from . import Entity
 
-
 def andTest(self, a, b):
     if b:
         messenger.send(self.getOutputEventName(), [a])

otp/level/ModelEntity.py

@@ -1,10 +1,7 @@
-from direct.directnotify import DirectNotifyGlobal
-
 from toontown.toonbase.ToontownGlobals import *
-
+from direct.directnotify import DirectNotifyGlobal
 from . import BasicEntities
 
-
 class ModelEntity(BasicEntities.NodePathEntity):
     LoadFuncs = {'loadModelCopy': loader.loadModelCopy,
      'loadModel': loader.loadModel,

otp/level/PathEntity.py

@@ -1,11 +1,8 @@
-from direct.directnotify import DirectNotifyGlobal
-from direct.interval.IntervalGlobal import *
-
-from toontown.suit import GoonPathData
 from toontown.toonbase.ToontownGlobals import *
-
+from direct.interval.IntervalGlobal import *
+from direct.directnotify import DirectNotifyGlobal
 from . import BasicEntities
-
+from toontown.suit import GoonPathData
 
 class PathEntity(BasicEntities.NodePathEntity):
     notify = DirectNotifyGlobal.directNotify.newCategory('PathEntity')

otp/level/PropSpinner.py

@@ -1,9 +1,6 @@
-from panda3d.core import Vec3
-
 from direct.interval.IntervalGlobal import *
-
 from .Entity import Entity
-
+from panda3d.core import Vec3
 
 class PropSpinner(Entity):
 

otp/level/VisibilityBlocker.py

@@ -1,6 +1,5 @@
 from . import Entity
 
-
 class VisibilityBlocker:
 
     def __init__(self):

otp/level/VisibilityExtender.py

@@ -1,6 +1,5 @@
 from . import Entity
 
-
 class VisibilityExtender(Entity.Entity):
 
     def __init__(self, level, entId):

otp/level/ZoneEntity.py

@@ -1,5 +1,5 @@
-from . import BasicEntities, ZoneEntityBase
-
+from . import ZoneEntityBase
+from . import BasicEntities
 
 class ZoneEntity(ZoneEntityBase.ZoneEntityBase, BasicEntities.NodePathAttribs):
 

otp/level/ZoneEntityAI.py

@@ -1,6 +1,5 @@
 from . import ZoneEntityBase
 
-
 class ZoneEntityAI(ZoneEntityBase.ZoneEntityBase):
 
     def __init__(self, level, entId):

otp/level/ZoneEntityBase.py

@@ -1,5 +1,5 @@
-from . import Entity, LevelConstants
-
+from . import Entity
+from . import LevelConstants
 
 class ZoneEntityBase(Entity.Entity):