diff options
Diffstat (limited to 'framework/test/piglit_test.py')
| -rw-r--r-- | framework/test/piglit_test.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/framework/test/piglit_test.py b/framework/test/piglit_test.py index b85bac0d5..053411e59 100644 --- a/framework/test/piglit_test.py +++ b/framework/test/piglit_test.py @@ -28,10 +28,7 @@ import glob import os import sys -try: - import simplejson as json -except ImportError: - import json +import json from framework import core, options from framework import status @@ -137,7 +134,7 @@ class PiglitGLTest(WindowResizeMixin, PiglitBaseTest): # What we really want is __init__(self, *args, new_arg=None, **kwargs), # but this doesn't work in python2. In python3 thanks to PEP3102, you # can in fact do just that - # The work around is to explicitely pass the arguments down. + # The work around is to explicitly pass the arguments down. super(PiglitGLTest, self).__init__(command, **kwargs) assert not (require_platforms and exclude_platforms) |