Commits

Mark Roddy committed 49101f8

Merging trunk changes 87-93 into the logparse-refactor branch

  • Participants
  • Parent commits 9bbb4e6
  • Branches logparse-refactor

Comments (0)

Files changed (1)

 """Implements the instant messager bot that handles communication"""
 
-from twisted.words.protocols import oscar
-from twisted.internet import reactor, protocol
+
+
 
 import warnings
+
+#Twisted warns as it's claiming to be re-writing
+#twistied.words.im at some point soon, it has been doing so
+#for several 
 warnings.filterwarnings("ignore",module="twisted.words.im")
-
 import twisted.words.im.tocsupport as ts
-
 warnings.resetwarnings()
 
+#Indirect warning as 'oscar' imports md5 which
+#is deprecated in Python v2.6
+warnings.filterwarnings("ignore",module="twisted.words.protocols",category=DeprecationWarning)
+from twisted.words.protocols import oscar
+warnings.resetwarnings()
+
+from twisted.internet import reactor, protocol
 import larvotto.response
 import time