Trunk: Merged the Devel-branch (branches/griatch) into /trunk. This constitutes a major refactoring of Evennia. Development will now continue in trunk. See the wiki and the past posts to the mailing list for info. /Griatch

src/irc/connection.py

@@ -3,14 +3,15 @@ This connects to an IRC network/channel and launches an 'bot' onto it.
 The bot then pipes what is being said between the IRC channel and one or
 more Evennia channels.
 """
+# TODO: This is deprecated!
 
 from twisted.words.protocols import irc
 from twisted.internet import protocol
 from twisted.internet import reactor
 from django.conf import settings
 from src.irc.models import IRCChannelMapping
-from src import comsys
-from src import logger 
+#from src import comsys
+from src.utils import logger 
 
 #store all irc channels
 IRC_CHANNELS = []

src/irc/models.py

@@ -1,13 +1,13 @@
 from django.db import models
 from django.conf import settings
-from src.channels.models import CommChannel
+from src.comms.models import Channel
 
 class IRCChannelMapping(models.Model):
     """
     Each IRCChannelMapping object determines which in-game channel incoming
     IRC messages are routed to.
     """
-    channel = models.ForeignKey(CommChannel)
+    channel = models.ForeignKey(Channel)
     irc_server_name = models.CharField(max_length=78)
     irc_channel_name = models.CharField(max_length=78)
     is_enabled = models.BooleanField(default=True)
@@ -15,7 +15,7 @@ class IRCChannelMapping(models.Model):
     class Meta:
         verbose_name = "IRC Channel mapping"
         verbose_name_plural = "IRC Channel mappings"        
-        permissions = settings.PERM_IRC
+        #permissions = settings.PERM_IRC
 
     def __str__(self):
         return "%s <-> %s (%s)" % (self.channel, self.irc_channel_name,