Browse Source

Pep8 on LeFactory generated code

Yann Weber 9 years ago
parent
commit
7242b685d2
1 changed files with 14 additions and 11 deletions
  1. 14
    11
      leobject/lefactory.py

+ 14
- 11
leobject/lefactory.py View File

83
 {name}._classtype = {classtype}
83
 {name}._classtype = {classtype}
84
 """.format(
84
 """.format(
85
             name = LeFactory.name2classname(emclass.name),
85
             name = LeFactory.name2classname(emclass.name),
86
-            ftypes = "{" + (','.join(['\n\t%s:%s' % (repr(f), v) for f, v in cls_fields.items()])) + "\n}",
86
+            ftypes = "{" + (','.join(['\n    %s: %s' % (repr(f), v) for f, v in cls_fields.items()])) + "\n}",
87
 
87
 
88
             ltypes = '{'+ (','.join(
88
             ltypes = '{'+ (','.join(
89
                 [
89
                 [
90
-                    '\n\t{ltname}:{ltattr_list}'.format(
90
+                    '\n    {ltname}: {ltattr_list}'.format(
91
                         ltname = lt,
91
                         ltname = lt,
92
-                        ltattr_list = '['+(','.join([
93
-                            '(%s,%s)'%(repr(ltname), ltftype) for ltname, ltftype in ltattr
92
+                        ltattr_list = '['+(', '.join([
93
+                            '(%s, %s)'%(repr(ltname), ltftype) for ltname, ltftype in ltattr
94
                         ]))+']'
94
                         ]))+']'
95
                     ) for lt, ltattr in cls_linked_types.items()
95
                     ) for lt, ltattr in cls_linked_types.items()
96
                 ]))+'}',
96
                 ]))+'}',
109
             type_fields.append(field.name)
109
             type_fields.append(field.name)
110
 
110
 
111
         for nat, sup_l in emtype.superiors().items():
111
         for nat, sup_l in emtype.superiors().items():
112
-            type_superiors.append('%s:[%s]' % (
112
+            type_superiors.append('%s: [%s]' % (
113
                 repr(nat),
113
                 repr(nat),
114
-                ','.join([LeFactory.name2classname(sup.name) for sup in sup_l])
114
+                ', '.join([LeFactory.name2classname(sup.name) for sup in sup_l])
115
             ))
115
             ))
116
 
116
 
117
         return """
117
         return """
122
 """.format(
122
 """.format(
123
             name=LeFactory.name2classname(emtype.name),
123
             name=LeFactory.name2classname(emtype.name),
124
             fields=repr(type_fields),
124
             fields=repr(type_fields),
125
-            dsups='{' + (','.join(type_superiors)) + '}',
125
+            dsups='{' + (', '.join(type_superiors)) + '}',
126
             leclass=LeFactory.name2classname(emtype.em_class.name)
126
             leclass=LeFactory.name2classname(emtype.em_class.name)
127
         )
127
         )
128
 
128
 
139
         result = ""
139
         result = ""
140
         #result += "#-*- coding: utf-8 -*-\n"
140
         #result += "#-*- coding: utf-8 -*-\n"
141
         #Putting import directives in result
141
         #Putting import directives in result
142
-        result += """
142
+        result += """## @author LeFactory
143
 
143
 
144
 from EditorialModel.model import Model
144
 from EditorialModel.model import Model
145
 from leobject.leobject import _LeObject
145
 from leobject.leobject import _LeObject
151
         result += """
151
         result += """
152
 import %s
152
 import %s
153
 import %s
153
 import %s
154
+
154
 """ % (backend_cls.__module__, datasource_cls.__module__)
155
 """ % (backend_cls.__module__, datasource_cls.__module__)
155
 
156
 
156
         #Generating the code for LeObject class
157
         #Generating the code for LeObject class
177
             result += """
178
             result += """
178
 ## @brief EmClass {name} LeClass child class
179
 ## @brief EmClass {name} LeClass child class
179
 # @see leobject::leclass::LeClass
180
 # @see leobject::leclass::LeClass
180
-class {name}(LeObject,LeClass):
181
+class {name}(LeObject, LeClass):
181
     _class_id = {uid}
182
     _class_id = {uid}
183
+
182
 """.format(
184
 """.format(
183
                 name=LeFactory.name2classname(emclass.name),
185
                 name=LeFactory.name2classname(emclass.name),
184
                 uid=emclass.uid
186
                 uid=emclass.uid
190
 # @see leobject::letype::LeType
192
 # @see leobject::letype::LeType
191
 class {name}(LeType, {leclass}):
193
 class {name}(LeType, {leclass}):
192
     _type_id = {uid}
194
     _type_id = {uid}
195
+
193
 """.format(
196
 """.format(
194
                 name=LeFactory.name2classname(emtype.name),
197
                 name=LeFactory.name2classname(emtype.name),
195
                 leclass=LeFactory.name2classname(emtype.em_class.name),
198
                 leclass=LeFactory.name2classname(emtype.em_class.name),
206
         me_uid = {comp.uid: LeFactory.name2classname(comp.name) for comp in emclass_l + emtype_l}
209
         me_uid = {comp.uid: LeFactory.name2classname(comp.name) for comp in emclass_l + emtype_l}
207
         result += """
210
         result += """
208
 ## @brief Dict for getting LeClass and LeType child classes given an EM uid
211
 ## @brief Dict for getting LeClass and LeType child classes given an EM uid
209
-LeObject._me_uid = %s
210
-""" % "{" + (','.join(['%s:%s' % (k, v) for k, v in me_uid.items()])) + "}"
212
+LeObject._me_uid = %s""" % "{" + (', '.join(['%s: %s' % (k, v) for k, v in me_uid.items()])) + "}"
213
+        result += "\n"
211
         return result
214
         return result

Loading…
Cancel
Save