core & Filter & Owner: Fix Python 2.6 compatibibility.

plugins/Filter/plugin.py

@@ -209,7 +209,7 @@ class Filter(callbacks.Plugin):
         commonly used for text that simply needs to be hidden from inadvertent
         reading by roaming eyes, since it's easily reversible.
         """
-        irc.reply(self._rot13_encoder(text.decode('utf8', errors='replace'))[0])
+        irc.reply(self._rot13_encoder(text.decode('utf8'))[0])
     rot13 = wrap(rot13, ['text'])
 
     @internationalizeDocstring

plugins/Owner/test.py

@@ -28,7 +28,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
+import sys
+
+if sys.version_info >= (2, 7, 0):
     from unittest import skip
+else:
+    # Workaround
+    def skip(string):
+        return lambda x:None
 from supybot.test import *
 
 import supybot.conf as conf

src/test.py

@@ -228,7 +228,7 @@ class PluginTestCase(SupyTestCase):
         if not usePrefixChar and query[0] in prefixChars:
             query = query[1:]
         if sys.version_info[0] < 3:
-            query = query.encode('utf8', errors='replace') # unicode->str
+            query = query.encode('utf8') # unicode->str
         msg = ircmsgs.privmsg(to, query, prefix=frm)
         if self.myVerbose:
             print 'Feeding: %r' % msg
@@ -423,7 +423,7 @@ class ChannelPluginTestCase(PluginTestCase):
         if query[0] not in prefixChars and usePrefixChar:
             query = prefixChars[0] + query
         if sys.version_info[0] < 3 and isinstance(query, unicode):
-            query = query.encode('utf8', errors='replace') # unicode->str
+            query = query.encode('utf8') # unicode->str
         msg = ircmsgs.privmsg(to, query, prefix=frm)
         if self.myVerbose:
             print 'Feeding: %r' % msg