MAJOR refactoring, I've touched just about every file here. Cleaned up the package structure and made it more in line with best practices. Also changed a lot of relative import paths to absolute to reflect the new structure. It's a lot more straightforward to read now, and a lot easier for IDEs to parse as well.

git-svn-id: http://pygbot.svn.sourceforge.net/svnroot/pygbot/trunk@12 4ffac776-36fa-42b0-9124-184eb47ee2cf

Author: chaos95

src/contrib/Events.py contrib/Events.py

@@ -42,8 +42,9 @@
 """
 
 import sys, string, random, time
-import log
-from BasePlugin import BasePlugin
+
+from pyGBot import log
+from pyGBot.BasePlugin import BasePlugin
 
 #if self.bot.has_key("ChanOp"):
 #    chanops = self.bot.plugins["ChanOp"]

src/Plugins/__init__.py contrib/__init__.py

@@ -16,11 +16,11 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
-from BasePlugin import BasePlugin
+from pyGBot import log
+from pyGBot.BasePlugin import BasePlugin
 
-from .pokerfiles.tourney import Tourney
-from .pokerfiles.command import Command
+from pyGBot.Plugins.games.pokerfiles.tourney import Tourney
+from pyGBot.Plugins.games.pokerfiles.command import Command
 
 class Poker(BasePlugin):
     def __init__(self, bot, options):

src/contrib/configobj.py contrib/configobj.py

@@ -20,8 +20,8 @@
 #      Also, ability to challenge draw-fours, possibly with !challenge
 import random
 
-import log
-from BasePlugin import BasePlugin
+from pyGBot import log
+from pyGBot.BasePlugin import BasePlugin
 
 class Uno(BasePlugin):
     colours = ['B', 'G', 'R', 'Y']

src/BasePlugin.py pyGBot/BasePlugin.py

@@ -42,8 +42,9 @@
 """
 
 import sys, string, random, time
-import log
-from BasePlugin import BasePlugin
+
+from pyGBot import log
+from pyGBot.BasePlugin import BasePlugin
 
 #---------------------------------------------------------------------
 # General texts for narrating the game.  Change these global strings

src/PluginEvents.py pyGBot/PluginEvents.py

@@ -15,7 +15,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-import log
+from pyGBot import log
 
 def ranksym(rank):
     #log.logger.debug('Card.ranksym()')

src/Plugins/chat/__init__.py pyGBot/Plugins/__init__.py

@@ -14,7 +14,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-import log
+from pyGBot import log
 
 class Command:
     "Extracts protocol, id, command, and arg from mail filter input"

src/Plugins/games/DnD.py pyGBot/Plugins/games/DnD.py

@@ -17,7 +17,7 @@
 from random import random, seed, shuffle
 from struct import unpack
 from card import Card
-import log
+from pyGBot import log
 
 class Deck:
     '''

src/Plugins/games/Mafia.py pyGBot/Plugins/games/Mafia.py

@@ -14,7 +14,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-import log
+from pyGBot import log
 import card
 
 class Hand:

src/Plugins/games/Poker.py pyGBot/Plugins/games/Poker.py

@@ -14,7 +14,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-import log
+from pyGBot import log
 from hand import Hand
 from command import Command
 

src/Plugins/games/Uno.py pyGBot/Plugins/games/Uno.py

@@ -14,7 +14,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-import log
+from pyGBot import log
 
 class Pot:
     def __init__(self, trigger = 0):

src/Plugins/games/Werewolf.py pyGBot/Plugins/games/Werewolf.py

@@ -21,9 +21,10 @@
 from datetime import datetime
 from random import choice
 
+from pyGBot import log
+
 from command import Command
 from deck import Deck
-import log
 from player import Player
 from pot import Pot
 

src/Plugins/games/__init__.py pyGBot/Plugins/games/__init__.py

@@ -16,9 +16,10 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
 from math import *
-from BasePlugin import BasePlugin
+
+from pyGBot import log
+from pyGBot.BasePlugin import BasePlugin
 
 class Calculate(BasePlugin):
     __plugintype__ = "active"

src/Plugins/games/pokerfiles/COPYING pyGBot/Plugins/games/pokerfiles/COPYING

@@ -16,9 +16,9 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
+from pyGBot import log
 from random import choice
-from BasePlugin import BasePlugin
+from pyGBot.BasePlugin import BasePlugin
 
 class Decide(BasePlugin):
     __plugintype__ = "active"

src/Plugins/games/pokerfiles/README pyGBot/Plugins/games/pokerfiles/README

@@ -16,10 +16,11 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
 import random
 import re
-from BasePlugin import BasePlugin
+
+from pyGBot import log
+from pyGBot.BasePlugin import BasePlugin
 
 class DnDStatsRoll(BasePlugin):
     __plugintype__ = "active"

src/Plugins/games/pokerfiles/__init__.py pyGBot/Plugins/games/pokerfiles/__init__.py

@@ -16,10 +16,11 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
 import random
 import re
-from BasePlugin import BasePlugin
+
+from pyGBot import log
+from pyGBot.BasePlugin import BasePlugin
 
 class Roll(BasePlugin):
     __plugintype__ = "active"

src/Plugins/games/pokerfiles/card.py pyGBot/Plugins/games/pokerfiles/card.py

@@ -18,9 +18,9 @@
 
 import hashlib
 
-import log
-from BasePlugin import BasePlugin
-from contrib.configobj import ConfigObj, ConfigObjError
+from pyGBot import log
+from pyGBot.BasePlugin import BasePlugin
+from contrib.configobj import ConfigObj
 
 class AuthLevels:
     User = 0

src/Plugins/games/pokerfiles/command.py pyGBot/Plugins/games/pokerfiles/command.py

@@ -16,9 +16,9 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
-from ..Commands import BaseCommand
-from ..Auth import AuthLevels as AL
+from pyGBot import log
+from pyGBot.Plugins.system.Commands import BaseCommand
+from pyGBot.Plugins.system.Auth import AuthLevels as AL
 
 class Do(BaseCommand):
     level = AL.Admin

src/Plugins/games/pokerfiles/commands.txt pyGBot/Plugins/games/pokerfiles/commands.txt

@@ -16,9 +16,9 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
-from ..Commands import BaseCommand
-from ..Auth import AuthLevels as AL
+from pyGBot import log
+from pyGBot.Plugins.system.Commands import BaseCommand
+from pyGBot.Plugins.system.Auth import AuthLevels as AL
 
 class JoinChannel(BaseCommand):
     level = AL.Admin

src/Plugins/games/pokerfiles/deck.py pyGBot/Plugins/games/pokerfiles/deck.py

@@ -16,8 +16,8 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-from ..Commands import BaseCommand
-from ..Auth import AuthLevels as AL
+from pyGBot.Plugins.system.Commands import BaseCommand
+from pyGBot.Plugins.system.Auth import AuthLevels as AL
 
 class ListGames(BaseCommand):
     level = AL.User

src/Plugins/games/pokerfiles/hand.py pyGBot/Plugins/games/pokerfiles/hand.py

@@ -16,9 +16,9 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
-from ..Commands import BaseCommand
-from ..Auth import AuthLevels as AL
+from pyGBot import log
+from pyGBot.Plugins.system.Commands import BaseCommand
+from pyGBot.Plugins.system.Auth import AuthLevels as AL
 
 class PartChannel(BaseCommand):
     level = AL.Admin

src/Plugins/games/pokerfiles/player.py pyGBot/Plugins/games/pokerfiles/player.py

@@ -16,8 +16,8 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-from ..Commands import BaseCommand
-from ..Auth import AuthLevels as AL
+from pyGBot.Plugins.system.Commands import BaseCommand
+from pyGBot.Plugins.system.Auth import AuthLevels as AL
 
 class PlayGame(BaseCommand):
     level = AL.User

src/Plugins/games/pokerfiles/pot.py pyGBot/Plugins/games/pokerfiles/pot.py

@@ -16,9 +16,9 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
-from ..Commands import BaseCommand
-from ..Auth import AuthLevels as AL
+from pyGBot import log
+from pyGBot.Plugins.system.Commands import BaseCommand
+from pyGBot.Plugins.system.Auth import AuthLevels as AL
 
 class Say(BaseCommand):
     level = AL.Admin

src/Plugins/games/pokerfiles/tourney.py pyGBot/Plugins/games/pokerfiles/tourney.py

@@ -16,9 +16,11 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
-from ..Commands import BaseCommand
-from ..Auth import AuthLevels as AL
+import random
+
+from pyGBot import log
+from pyGBot.Plugins.system.Commands import BaseCommand
+from pyGBot.Plugins.system.Auth import AuthLevels as AL
 
 class StatsRoll(BaseCommand):
     level = AL.User

src/Plugins/math/Calculate.py pyGBot/Plugins/math/Calculate.py

@@ -16,8 +16,8 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-from ..Commands import BaseCommand
-from ..Auth import AuthLevels as AL
+from pyGBot.Plugins.system.Commands import BaseCommand
+from pyGBot.Plugins.system.Auth import AuthLevels as AL
 
 class StopGame(BaseCommand):
     level = AL.User

src/Plugins/math/__init__.py pyGBot/Plugins/math/__init__.py

@@ -16,10 +16,10 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
-from BasePlugin import BasePlugin
+from pyGBot import log
+from pyGBot.BasePlugin import BasePlugin
 
-from .Auth import AuthLevels as AL
+from pyGBot.Plugins.system.Auth import AuthLevels as AL
 
 class BaseCommand:
     """Static base class for one-line commands.
@@ -45,9 +45,9 @@ def __init__(self, bot, options):
 
         for friendlyname, commandname in options.iteritems():
             if not friendlyname.startswith('_'):
-                exec "from .CommandSpec." + commandname + " import " + commandname + " as C_" + commandname
-                exec "command = C_" + commandname
-                self.commands[friendlyname] = command
+                log.logger.info("Importing command " + commandname + " with friendly name " + friendlyname)
+                command = __import__("pyGBot.Plugins.system.CommandSpec." + commandname, fromlist = [commandname])
+                self.commands[friendlyname] = getattr(command, commandname)
 
     def pubout(self, channel, message):
         self.bot.pubout(channel, message)

src/Plugins/probability/Decide.py pyGBot/Plugins/probability/Decide.py

@@ -16,8 +16,8 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import log
-from BasePlugin import BasePlugin
+from pyGBot import log
+from pyGBot.BasePlugin import BasePlugin
 
 class Startup(BasePlugin):
     def __init__(self, bot, options):