[Python-modules-commits] r11455 - in packages/pysilc/trunk/debian (3 files)

[stefanor-guest at users.alioth.debian.org]

    Date: Saturday, January 30, 2010 @ 14:27:10
  Author: stefanor-guest
Revision: 11455

Add patch for demo.py for users with special characters in their name

Added:
  packages/pysilc/trunk/debian/patches/utf8-realname.diff
Modified:
  packages/pysilc/trunk/debian/changelog
  packages/pysilc/trunk/debian/patches/series

Modified: packages/pysilc/trunk/debian/changelog
===================================================================
--- packages/pysilc/trunk/debian/changelog	2010-01-30 14:19:55 UTC (rev 11454)
+++ packages/pysilc/trunk/debian/changelog	2010-01-30 14:27:10 UTC (rev 11455)
@@ -1,3 +1,9 @@
+pysilc (0.5-2) UNRELEASED; urgency=low
+
+  * Add patch to example demo.py for UTF-8 Real Names in /etc/passwd
+
+ -- Stefano Rivera <stefano at rivera.za.net>  Sat, 30 Jan 2010 16:12:56 +0200
+
 pysilc (0.5-1) unstable; urgency=low
 
   * Initial release (Closes: #564605)

Modified: packages/pysilc/trunk/debian/patches/series
===================================================================
--- packages/pysilc/trunk/debian/patches/series	2010-01-30 14:19:55 UTC (rev 11454)
+++ packages/pysilc/trunk/debian/patches/series	2010-01-30 14:27:10 UTC (rev 11455)
@@ -2,3 +2,4 @@
 fix-build.diff
 client_id.diff
 fix-segfaults.diff
+utf8-realname.diff

Added: packages/pysilc/trunk/debian/patches/utf8-realname.diff
===================================================================
--- packages/pysilc/trunk/debian/patches/utf8-realname.diff	                        (rev 0)
+++ packages/pysilc/trunk/debian/patches/utf8-realname.diff	2010-01-30 14:27:10 UTC (rev 11455)
@@ -0,0 +1,18 @@
+Description: If the user's real name is UTF-8 encoded with non-ASCII
+ characters, the demo will throw an exception.
+Author: Stefano Rivera <stefano at rivera.za.net>
+Forwarded: https://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=2917&group_id=6260
+Date: 2010-01-30
+
+--- a/examples/demo.py
++++ b/examples/demo.py
+@@ -166,7 +166,8 @@
+         self._cache_channel(channel)
+         print 'SILC: Reply (Join)', channel, topic, users
+         myself = self.user()
+-        self.send_channel_message(channel, 'My name is %s. I live in %s' % (myself.realname, myself.hostname))
++        self.send_channel_message(channel, u'My name is %s. I live in %s' % (
++            unicode(myself.realname, 'utf-8', 'ignore'), myself.hostname))
+ 
+     def command_reply_motd(self, msg):
+         print 'SILC: Reply (MOTD):', msg