Author: bugman Date: Wed Nov 12 09:11:08 2014 New Revision: 26540 URL: http://svn.gna.org/viewcvs/relax?rev=26540&view=rev Log: Merged revisions 26538 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r26538 | bugman | 2014-11-11 17:57:37 +0100 (Tue, 11 Nov 2014) | 3 lines Missing import of lib.compat.unicode in lib.check_types. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/lib/check_types.py Propchange: branches/frame_order_cleanup/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Wed Nov 12 09:11:08 2014 @@ -1 +1 @@ -/trunk:1-26531 +/trunk:1-26538 Modified: branches/frame_order_cleanup/lib/check_types.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/check_types.py?rev=26540&r1=26539&r2=26540&view=diff ============================================================================== --- branches/frame_order_cleanup/lib/check_types.py (original) +++ branches/frame_order_cleanup/lib/check_types.py Wed Nov 12 09:11:08 2014 @@ -47,7 +47,7 @@ # relax module imports. -from lib.compat import IOBase +from lib.compat import IOBase, unicode def is_complex(num):