git-svn-id: http://svn.calculate.ru/calculate2/calculate-client/trunk@439 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_client.py

@@ -35,6 +35,10 @@ tr.setLanguage(sys.modules[__name__])
 
 pcs = cl_utils.prettyColumnStr
 
+class printNoColor:
+    def colorPrint(self,attr,fg,bg,string):
+        sys.stdout.write(string)
+
 # Импортированные классы в cl_ldap
 # Запись ошибок
 imp_cl_err = cl_profile._error
@@ -45,34 +49,6 @@ imp_cl_help = cl_utils2.cl_help
 # Форматированный вывод
 imp_cl_smcon = cl_utils2.cl_smartcon
 
-class newClass:
-    """Класс для создания новых классов"""
-    def createNewClass(self, name, bases, attrs={}):
-        """Создает объект нового класса
-
-        createNewClass(self, name, bases, attrs)
-        name - имя класса - str,
-        bases - cписок наследуемых классов - (tuple),
-        attrs - аттрибуты класса - {dict}
-        """
-        class newMethod:
-            #Объединяем конфигурации
-            def join(self, newObj):
-                if newObj.__class__.__name__ == self.__class__.__name__:
-                    self.docObj.joinDoc(newObj.doc)
-        attrsNew = {}
-        attrsNew["configName"] = name
-        if attrs:
-            for key in attrs.keys():
-               attrsNew[key] = attrs[key]
-        newCl = type(name, bases + (newMethod, object,), attrsNew)
-        return newCl
-
-class printNoColor:
-    def colorPrint(self,attr,fg,bg,string):
-        sys.stdout.write(string)
-
-
 class cl_client(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
     """Основной класс для работы с LDAP"""
     def __init__(self, cmdName):

scripts/cl-client

@@ -40,10 +40,9 @@ if __name__ == "__main__":
             clVars.printVars(terms)
     elif not optObj.flagHelp:
         if optObj.opt.has_key('color') and optObj.opt["color"]=="never":
-                nwClObj = cl_client.newClass()
-                newClass = nwClObj.createNewClass("cl_clientnocolor",
-                                      (cl_client.printNoColor,
-                                      cl_client.cl_client))
+                newClass = type("cl_client_nocolor",(cl_client.printNoColor,
+                                                cl_client.cl_client,object),
+                                {})
                 ldapObj = newClass("cl-client")
         if optObj.params.has_key('user'):
             if not optObj.opt.has_key('r') or not optObj.opt.has_key('mount'):

scripts/cl-createhome

@@ -41,10 +41,9 @@ if __name__ == "__main__":
     elif not optObj.flagHelp and optObj.params.has_key('user'):
         userName = optObj.params['user'].strip()
         if optObj.opt.has_key('color') and optObj.opt["color"]=="never":
-            nwClObj = cl_client.newClass()
-            newClass = nwClObj.createNewClass("cl_clientnocolor",
-                                      (cl_client.printNoColor,
-                                      cl_client.cl_client))
+            newClass = type("cl_client_nocolor",(cl_client.printNoColor,
+                                                cl_client.cl_client,object),
+                            {})
             ldapObj = newClass("cl-createhome")
         if not ldapObj.createHome(userName):
             flagError = True

scripts/cl-sync

@@ -41,10 +41,9 @@ if __name__ == "__main__":
     elif not optObj.flagHelp:
         if optObj.params.has_key('user') and optObj.opt:
             if optObj.opt.has_key('color') and optObj.opt["color"]=="never":
-                nwClObj = cl_client.newClass()
-                newClass = nwClObj.createNewClass("cl_clientnocolor",
-                                      (cl_client.printNoColor,
-                                      cl_client.cl_client))
+                newClass = type("cl_client_nocolor",(cl_client.printNoColor,
+                                                cl_client.cl_client,object),
+                                {})
                 ldapObj = newClass("cl-sync")
             if optObj.opt.has_key('login'):
                 userName = optObj.params['user']