diff options
| author | Dylan Baker <baker.dylan.c@gmail.com> | 2016-02-10 18:04:31 -0800 |
|---|---|---|
| committer | Dylan Baker <baker.dylan.c@gmail.com> | 2016-02-11 11:58:06 -0800 |
| commit | c4a5618a5072e26517b5a87f4fb210bbb2a35096 (patch) | |
| tree | 47478a2249a31a394cedcea686802839720b39dc /framework/status.py | |
| parent | b7a65af75afb3664a1e908b09c8a39fa4490c2cc (diff) | |
python: function with six version 1.5.2
CMake actually marks that we require six 1.4.0, however, I can't find
any packages anywhere for 1.4.0, and the lowest version I've seen
requested is 1.5.2.
This fixes requirements for working with six 1.5.2, and sets tox to use
1.5.2 (and a suitable version of mock). Primarily there are a few things
we're using that are not available: six.moves.getcwd, six.viewvalues,
six.python_2_unicode_compatible.
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Tested-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'framework/status.py')
| -rw-r--r-- | framework/status.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/status.py b/framework/status.py index 7fca8561d..6a1b85e8a 100644 --- a/framework/status.py +++ b/framework/status.py @@ -62,7 +62,7 @@ from __future__ import ( import six -from framework import exceptions +from framework import exceptions, compat __all__ = ['NOTRUN', 'PASS', @@ -97,7 +97,7 @@ def status_lookup(status): raise StatusException(status) -@six.python_2_unicode_compatible +@compat.python_2_unicode_compatible class StatusException(exceptions.PiglitInternalError): """ Raise this exception when a string is passed to status_lookup that doesn't exists @@ -116,7 +116,7 @@ class StatusException(exceptions.PiglitInternalError): return u'Unknown status "{}"'.format(self.__status) -@six.python_2_unicode_compatible +@compat.python_2_unicode_compatible class Status(object): """ A simple class for representing the output values of tests. |