diff options
| author |   fuzzyray <fuzzyray@gentoo.org> | 2010-03-24 15:21:58 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2010-03-24 15:21:58 +0000 |
| commit | db09a0e43e2e1cf98f0d789f651a1816a46dcba7 (patch) | |
| tree | 190142ffd40988d90ab8f5789500be5290e91088 /pym/gentoolkit/test/test_keyword.py | |
| parent | Update to genscripts rev 382. This has more fixes for py3k and the modular re... (diff) | |
| download | gentoolkit-db09a0e43e2e1cf98f0d789f651a1816a46dcba7.tar.gz gentoolkit-db09a0e43e2e1cf98f0d789f651a1816a46dcba7.tar.bz2 gentoolkit-db09a0e43e2e1cf98f0d789f651a1816a46dcba7.zip | |
Merge genscripts rev 406
svn path=/trunk/gentoolkit/; revision=756
Diffstat (limited to 'pym/gentoolkit/test/test_keyword.py')
| -rw-r--r-- | pym/gentoolkit/test/test_keyword.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/gentoolkit/test/test_keyword.py b/pym/gentoolkit/test/test_keyword.py index 5418961..3e72e5f 100644 --- a/pym/gentoolkit/test/test_keyword.py +++ b/pym/gentoolkit/test/test_keyword.py @@ -1,3 +1,4 @@ +import sys import unittest import warnings from tempfile import NamedTemporaryFile @@ -6,9 +7,8 @@ try: except ImportError: from test import support as test_support -from portage import os - from gentoolkit import keyword +from gentoolkit.test import cmp class TestGentoolkitKeyword(unittest.TestCase): @@ -44,7 +44,9 @@ class TestGentoolkitKeyword(unittest.TestCase): '~amd64', '~ppc', '~x86', '~amd64-linux', '~x86-linux', '~ppc-macos', '~x86-macos', '~x86-solaris' ] - self.failUnlessEqual(sorted(kwds_presort, cmp=compare_strs), kwds_postsort) + if sys.hexversion < 0x3000000: + self.failUnlessEqual(sorted(kwds_presort, cmp=compare_strs), kwds_postsort) + self.failUnlessEqual(sorted(kwds_presort, key = keyword.Keyword), kwds_postsort) def test_main(): |