diff -rupN setproctitle-1.1.1/tests/setproctitle_test.py /root/setproctitle-1.1.1/tests/setproctitle_test.py --- setproctitle-1.1.1/tests/setproctitle_test.py 2011-02-03 00:04:16.000000000 +0100 +++ /root/setproctitle-1.1.1/tests/setproctitle_test.py 2011-03-25 17:40:19.000000000 +0100 @@ -16,10 +16,10 @@ from subprocess import Popen, PIPE, STDO IS_PY3K = sys.version_info[0] == 3 try: - from nose.plugins.skip import SkipTest + from unittest import SkipTest except ImportError: try: - from unittest import SkipTest + from nose.plugins.skip import SkipTest except ImportError: class SkipTest(Exception): pass @@ -162,9 +162,17 @@ class SetproctitleTestCase(unittest.Test def test_unicode(self): """Title can contain unicode characters.""" - if 'utf-8' != sys.getdefaultencoding(): - raise SkipTest("encoding '%s' can't deal with snowmen" + snowman = u'\u2603' + try: + snowman.encode(sys.getdefaultencoding()) + except UnicodeEncodeError: + raise SkipTest("default encoding '%s' can't deal with snowmen" % sys.getdefaultencoding()) + try: + snowman.encode(sys.getfilesystemencoding()) + except UnicodeEncodeError: + raise SkipTest("file system encoding '%s' can't deal with snowmen" + % sys.getfilesystemencoding()) rv = self.run_script(r""" snowman = u'\u2603'