rpms/python-pmw/F-10 python-pmw-PmwMenuBar.py.patch, NONE, 1.1 python-pmw.spec, 1.1, 1.2

[Timothy Fenn]

Author: timfenn

Update of /cvs/pkgs/rpms/python-pmw/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4425

Modified Files:
	python-pmw.spec 
Added Files:
	python-pmw-PmwMenuBar.py.patch 
Log Message:
* Wed May 13 2009 Tim Fenn <fenn at stanford.edu> - 1.3.2-6
- patch for unicode menus (Mamoru Tasaka), bug ID 500459



python-pmw-PmwMenuBar.py.patch:

--- NEW FILE python-pmw-PmwMenuBar.py.patch ---
--- Pmw.1.3.2/src/Pmw/Pmw_1_3/lib/PmwMenuBar.py.debug	2007-08-08 04:55:54.000000000 +0900
+++ Pmw.1.3.2/src/Pmw/Pmw_1_3/lib/PmwMenuBar.py	2009-05-13 18:59:22.000000000 +0900
@@ -187,7 +187,9 @@
                     menubutton = self.component(menuName + '-button')
                     underline = string.atoi(str(menubutton.cget('underline')))
                     if underline != -1:
-                        label = str(menubutton.cget(textKey))
+                        label = menubutton.cget(textKey)
+                        if type(label) != types.UnicodeType:
+                            label = str(label)
                         if underline < len(label):
                             hotkey = string.lower(label[underline])
                             if hotkey not in hotkeyList:
@@ -201,7 +203,9 @@
                         underline = string.atoi(
                             str(menu.entrycget(item, 'underline')))
                         if underline != -1:
-                            label = str(menu.entrycget(item, textKey))
+                            label = menu.entrycget(item, textKey)
+                            if type(label) != types.UnicodeType:
+                                label = str(label)
                             if underline < len(label):
                                 hotkey = string.lower(label[underline])
                                 if hotkey not in hotkeyList:


Index: python-pmw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pmw/F-10/python-pmw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-pmw.spec	15 Oct 2008 00:17:29 -0000	1.1
+++ python-pmw.spec	13 May 2009 21:47:17 -0000	1.2
@@ -3,11 +3,12 @@
 Summary: Python powerwidgets
 Name: python-pmw
 Version: 1.3.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT and GPLv2+
 Group: Development/Libraries
 URL: http://pmw.sourceforge.net/
 Source: http://downloads.sourceforge.net/pmw/Pmw.%{version}.tar.gz
+Patch0: python-pmw-PmwMenuBar.py.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-setuptools-devel
 Requires: tkinter
@@ -22,6 +23,7 @@ widgets, paned widgets, scrolled widgets
 
 %prep
 %setup -q -n Pmw.%{version}
+%patch0 -p1
 
 %build
 cd src
@@ -47,6 +49,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/Pmw
 
 %changelog
+* Wed May 13 2009 Tim Fenn <fenn at stanford.edu> - 1.3.2-6
+- patch for unicode menus (Mamoru Tasaka), bug ID 500459
+
 * Wed Oct 08 2008 Tim Fenn <fenn at stanford.edu> - 1.3.2-5
 - remove python and python-devel from buildrequires/requires