diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-21 09:08:14 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-21 13:33:20 -0400 |
| commit | fe716cc6c541239a34d55c0ca5812379a821779a (patch) | |
| tree | bc183cb1af816cb5fe184a21f99e38f15c200d6f /testsuite/common.py | |
| parent | d0efac8fde1f2bfc77b45899073c225201c64a2c (diff) | |
| download | bcfg2-fe716cc6c541239a34d55c0ca5812379a821779a.tar.gz bcfg2-fe716cc6c541239a34d55c0ca5812379a821779a.tar.bz2 bcfg2-fe716cc6c541239a34d55c0ca5812379a821779a.zip | |
fixed builtin mocks for py3k
Diffstat (limited to 'testsuite/common.py')
| -rw-r--r-- | testsuite/common.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/testsuite/common.py b/testsuite/common.py index e0a27b2c7..cc24112e7 100644 --- a/testsuite/common.py +++ b/testsuite/common.py @@ -1,4 +1,5 @@ import os +import sys import unittest from functools import wraps @@ -7,6 +8,11 @@ datastore = "/" XI_NAMESPACE = "http://www.w3.org/2001/XInclude" XI = "{%s}" % XI_NAMESPACE +if sys.hexversion >= 0x03000000: + inPy3k = True +else: + inPy3k = False + try: from django.core.management import setup_environ has_django = True @@ -29,6 +35,10 @@ except ImportError: calls """ return (args, kwargs) +if inPy3k: + builtins = "builtins" +else: + builtins = "__builtin__" if hasattr(unittest.TestCase, "assertItemsEqual"): TestCase = unittest.TestCase |