[Lldb-commits] [lldb] r250859 - Use six to portably assign metaclasses in Python 2 and 3.

[Zachary Turner via lldb-commits]

Author: zturner
Date: Tue Oct 20 16:06:05 2015
New Revision: 250859

URL: http://llvm.org/viewvc/llvm-project?rev=250859&view=rev
Log:
Use six to portably assign metaclasses in Python 2 and 3.

Modified:
    lldb/trunk/test/dotest.py
    lldb/trunk/test/lldbtest.py

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=250859&r1=250858&r2=250859&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Tue Oct 20 16:06:05 2015
@@ -44,7 +44,6 @@ import lldbtest_config
 
 import six
 
-
 def is_exe(fpath):
     """Returns true if fpath is an executable."""
     return os.path.isfile(fpath) and os.access(fpath, os.X_OK)

Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=250859&r1=250858&r2=250859&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Tue Oct 20 16:06:05 2015
@@ -33,6 +33,8 @@ $
 
 from __future__ import print_function
 
+import lldb_shared
+
 import abc
 import gc
 import glob
@@ -48,7 +50,8 @@ import unittest2
 import lldb
 import lldbtest_config
 import lldbutil
-from _pyio import __metaclass__
+
+from six import add_metaclass
 
 if sys.version_info.major < 3:
     import urlparse
@@ -254,8 +257,8 @@ class recording(StringIO.StringIO):
             print(self.getvalue(), file=self.session)
         self.close()
 
+ at add_metaclass(abc.ABCMeta)
 class _BaseProcess(object):
-    __metaclass__ = abc.ABCMeta
 
     @abc.abstractproperty
     def pid(self):
@@ -2279,6 +2282,8 @@ class LLDBTestCaseFactory(type):
                 newattrs[attrname] = attrvalue
         return super(LLDBTestCaseFactory, cls).__new__(cls, name, bases, newattrs)
 
+# Setup the metaclass for this class to change the list of the test methods when a new class is loaded
+ at add_metaclass(LLDBTestCaseFactory)
 class TestBase(Base):
     """
     This abstract base class is meant to be subclassed.  It provides default
@@ -2339,9 +2344,6 @@ class TestBase(Base):
     # Can be overridden by the LLDB_TIME_WAIT_NEXT_LAUNCH environment variable.
     timeWaitNextLaunch = 1.0;
 
-    # Setup the metaclass for this class to change the list of the test methods when a new class is loaded
-    __metaclass__ = LLDBTestCaseFactory
-
     def doDelay(self):
         """See option -w of dotest.py."""
         if ("LLDB_WAIT_BETWEEN_TEST_CASES" in os.environ and