Ver código fonte

Pep8 on LeFactory generated code

Yann Weber 9 anos atrás
pai
commit
7242b685d2
1 arquivos alterados com 14 adições e 11 exclusões
  1. 14
    11
      leobject/lefactory.py

+ 14
- 11
leobject/lefactory.py Ver arquivo

@@ -83,14 +83,14 @@ class LeFactory(object):
83 83
 {name}._classtype = {classtype}
84 84
 """.format(
85 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 88
             ltypes = '{'+ (','.join(
89 89
                 [
90
-                    '\n\t{ltname}:{ltattr_list}'.format(
90
+                    '\n    {ltname}: {ltattr_list}'.format(
91 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 95
                     ) for lt, ltattr in cls_linked_types.items()
96 96
                 ]))+'}',
@@ -109,9 +109,9 @@ class LeFactory(object):
109 109
             type_fields.append(field.name)
110 110
 
111 111
         for nat, sup_l in emtype.superiors().items():
112
-            type_superiors.append('%s:[%s]' % (
112
+            type_superiors.append('%s: [%s]' % (
113 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 117
         return """
@@ -122,7 +122,7 @@ class LeFactory(object):
122 122
 """.format(
123 123
             name=LeFactory.name2classname(emtype.name),
124 124
             fields=repr(type_fields),
125
-            dsups='{' + (','.join(type_superiors)) + '}',
125
+            dsups='{' + (', '.join(type_superiors)) + '}',
126 126
             leclass=LeFactory.name2classname(emtype.em_class.name)
127 127
         )
128 128
 
@@ -139,7 +139,7 @@ class LeFactory(object):
139 139
         result = ""
140 140
         #result += "#-*- coding: utf-8 -*-\n"
141 141
         #Putting import directives in result
142
-        result += """
142
+        result += """## @author LeFactory
143 143
 
144 144
 from EditorialModel.model import Model
145 145
 from leobject.leobject import _LeObject
@@ -151,6 +151,7 @@ import EditorialModel.fieldtypes
151 151
         result += """
152 152
 import %s
153 153
 import %s
154
+
154 155
 """ % (backend_cls.__module__, datasource_cls.__module__)
155 156
 
156 157
         #Generating the code for LeObject class
@@ -177,8 +178,9 @@ class LeObject(_LeObject):
177 178
             result += """
178 179
 ## @brief EmClass {name} LeClass child class
179 180
 # @see leobject::leclass::LeClass
180
-class {name}(LeObject,LeClass):
181
+class {name}(LeObject, LeClass):
181 182
     _class_id = {uid}
183
+
182 184
 """.format(
183 185
                 name=LeFactory.name2classname(emclass.name),
184 186
                 uid=emclass.uid
@@ -190,6 +192,7 @@ class {name}(LeObject,LeClass):
190 192
 # @see leobject::letype::LeType
191 193
 class {name}(LeType, {leclass}):
192 194
     _type_id = {uid}
195
+
193 196
 """.format(
194 197
                 name=LeFactory.name2classname(emtype.name),
195 198
                 leclass=LeFactory.name2classname(emtype.em_class.name),
@@ -206,6 +209,6 @@ class {name}(LeType, {leclass}):
206 209
         me_uid = {comp.uid: LeFactory.name2classname(comp.name) for comp in emclass_l + emtype_l}
207 210
         result += """
208 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 214
         return result

Carregando…
Cancelar
Salvar