Fix slowdown on Python 3

lib/colorer.py

@@ -1,7 +1,6 @@
 import os
 import re
 import sys
-from lib.singleton import Singleton
 
 
 # Use it to print messages on the screen and to the worker's log.
@@ -128,7 +127,6 @@ class Colorer(object):
     1. ftp://ftp.cs.utk.edu/pub/shuford/terminal/dec_vt220_codes.txt
     2. http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
     """
-    __metaclass__ = Singleton
     fgcolor = {
         "black":     '0;30',
         "red":       '0;31',

lib/options.py

@@ -2,7 +2,6 @@
 import sys
 import argparse
 from itertools import product
-from lib.singleton import Singleton
 
 from lib.colorer import color_stdout
 
@@ -23,14 +22,28 @@ def env_list(name, default):
     return value_list or default
 
 
-class Options:
+class Options(object):
     """Handle options of test-runner"""
 
-    __metaclass__ = Singleton
+    _instance = None
+    _initialized = False
+
+    def __new__(cls, *args, **kwargs):
+        """Make the class singleton."""
+        if cls._instance:
+            return cls._instance
+        cls._instance = super(Options, cls).__new__(cls, *args, **kwargs)
+        return cls._instance
 
     def __init__(self):
         """Add all program options, with their defaults."""
 
+        # The __init__() method is called always, even when we
+        # return already initialized Options instance from
+        # __new__().
+        if Options._initialized:
+            return
+
         parser = argparse.ArgumentParser(
             description="Tarantool regression test suite front-end.")
 
@@ -264,6 +277,8 @@ def __init__(self):
         self.args = parser.parse_args()
         self.check()
 
+        Options._initialized = True
+
     def check(self):
         """Check the arguments for correctness."""
         check_error = False