1515import gimpcolor
1616import gimpenums
1717
18- import pypredef_generator
18+ import pypredefgen
1919
2020#===============================================================================
2121
@@ -43,10 +43,10 @@ def get_name(self, include_base_type=False):
4343 if include_base_type and self ._base_type is not None :
4444 return (
4545 "{0}({1})" .format (
46- pypredef_generator .get_full_type_name (self ._type_ ),
47- pypredef_generator .get_full_type_name (self ._base_type )))
46+ pypredefgen .get_full_type_name (self ._type_ ),
47+ pypredefgen .get_full_type_name (self ._base_type )))
4848 else :
49- return pypredef_generator .get_full_type_name (self ._type_ )
49+ return pypredefgen .get_full_type_name (self ._type_ )
5050
5151 @classmethod
5252 def get_by_id (cls , pdb_type_id ):
@@ -89,10 +89,11 @@ class PdbParam(object):
8989
9090 def __init__ (self , pdb_type_id , name , description = None ):
9191 self ._pdb_type_id = pdb_type_id
92- self ._orig_name = name .decode (pypredef_generator .TEXT_FILE_ENCODING )
92+ self ._orig_name = name .decode (pypredefgen .TEXT_FILE_ENCODING )
9393
9494 self .description = (
95- description .decode (pypredef_generator .TEXT_FILE_ENCODING ) if description is not None else "" )
95+ description .decode (pypredefgen .TEXT_FILE_ENCODING )
96+ if description is not None else "" )
9697 self .pdb_type = PdbType .get_by_id (pdb_type_id )
9798 self .name = pythonize_string (self ._orig_name )
9899
@@ -166,7 +167,8 @@ def __init__(self, matches_and_replacements, get_regex_for_matches_func):
166167 def get_pattern (self ):
167168 if self ._pattern is None :
168169 self ._pattern = re .compile (
169- self ._get_regex_for_matches_func (self ._get_matches_regex_component ()), flags = re .UNICODE )
170+ self ._get_regex_for_matches_func (self ._get_matches_regex_component ()),
171+ flags = re .UNICODE )
170172
171173 return self ._pattern
172174
@@ -193,11 +195,11 @@ def split_param_description(param_description, regex):
193195
194196
195197def generate_predefined_completions_for_gimp_pdb ():
196- pdb_element = pypredef_generator .Element (
197- gimp .pdb , "pdb" , gimp .pdb , pypredef_generator .get_ast_node_for_module (gimp .pdb ))
198+ pdb_element = pypredefgen .Element (
199+ gimp .pdb , "pdb" , gimp .pdb , pypredefgen .get_ast_node_for_module (gimp .pdb ))
198200
199201 for child_member_name in dir (gimp .pdb ):
200- child_element = pypredef_generator .Element (
202+ child_element = pypredefgen .Element (
201203 getattr (pdb_element .object , child_member_name , None ),
202204 child_member_name , pdb_element .module )
203205
@@ -207,11 +209,11 @@ def generate_predefined_completions_for_gimp_pdb():
207209 else :
208210 _insert_ast_node_for_pdb_function (child_element , pdb_element )
209211 else :
210- pypredef_generator .insert_ast_node (child_member_name , pdb_element , module = gimp )
212+ pypredefgen .insert_ast_node (child_member_name , pdb_element , module = gimp )
211213
212- pypredef_generator .insert_ast_docstring (pdb_element )
214+ pypredefgen .insert_ast_docstring (pdb_element )
213215
214- pypredef_generator .write_pypredef_file (pdb_element , filename = "gimp.pdb" )
216+ pypredefgen .write_pypredef_file (pdb_element , filename = "gimp.pdb" )
215217
216218
217219def _is_element_pdb_function (element ):
@@ -225,7 +227,7 @@ def _is_element_generated_temporary_pdb_function(element):
225227def _insert_ast_node_for_pdb_function (pdb_function_element , pdb_element ):
226228 pdb_function_node = _get_ast_node_for_pdb_function (pdb_function_element .object )
227229 pdb_element .node .body .append (pdb_function_node )
228- pypredef_generator .insert_ast_docstring (pdb_function_element )
230+ pypredefgen .insert_ast_docstring (pdb_function_element )
229231
230232
231233def _get_ast_node_for_pdb_function (pdb_function ):
@@ -238,7 +240,8 @@ def _get_ast_node_for_pdb_function(pdb_function):
238240 additional_docstring_processing_callbacks = [
239241 _pythonize_true_false_names ,
240242 _PdbFunctionNamePythonizer .pythonize ,
241- _PdbParamNamePythonizer (get_pdb_params (pdb_function .params )).pythonize_docstring ]),
243+ _PdbParamNamePythonizer (
244+ get_pdb_params (pdb_function .params )).pythonize_docstring ]),
242245 _get_ast_return_value_types_for_pdb_function (pdb_function )],
243246 decorator_list = [])
244247
@@ -301,7 +304,7 @@ def _get_ast_docstring_for_pdb_function(
301304
302305 docstring = "\n " + docstring .strip () + "\n "
303306
304- docstring = docstring .encode (pypredef_generator .TEXT_FILE_ENCODING )
307+ docstring = docstring .encode (pypredefgen .TEXT_FILE_ENCODING )
305308
306309 return ast .Expr (value = ast .Str (s = docstring ))
307310
@@ -350,7 +353,8 @@ class _PdbParamIntToBoolConverter(object):
350353 _PDB_BOOL_PARAM_DESCRIPTION_MATCH_REGEX_COMPONENTS = (
351354 _BOOL_PARAM_DESCRIPTION_TRUE_FALSE_REGEX_FORMAT .format (r"true" , r"false" , r"1" , r"0" )
352355 + r"|"
353- + _BOOL_PARAM_DESCRIPTION_TRUE_FALSE_REGEX_FORMAT .format (r"false" , r"true" , r"0" , r"1" ))
356+ + _BOOL_PARAM_DESCRIPTION_TRUE_FALSE_REGEX_FORMAT .format (
357+ r"false" , r"true" , r"0" , r"1" ))
354358
355359 _PDB_BOOL_PARAM_DESCRIPTION_MATCH_REGEX = (
356360 r"("
@@ -399,7 +403,7 @@ def _pythonize_function_name(match):
399403 def _fill_pdb_function_names_map (cls ):
400404 if not cls ._pdb_function_names_map :
401405 for pdb_member_name in dir (gimp .pdb ):
402- element = pypredef_generator .Element (
406+ element = pypredefgen .Element (
403407 getattr (gimp .pdb , pdb_member_name , None ), pdb_member_name , gimp .pdb )
404408 if (_is_element_pdb_function (element )
405409 and not _is_element_generated_temporary_pdb_function (element )):
@@ -474,7 +478,8 @@ def _get_gimpenums_names_map(cls):
474478
475479 for python_enum_name in python_gimpenums_names :
476480 pdb_enum_name = unpythonize_string (python_enum_name )
477- cls ._gimpenums_names_map [pdb_enum_name ] = gimpenums .__name__ + "." + python_enum_name
481+ cls ._gimpenums_names_map [pdb_enum_name ] = (
482+ gimpenums .__name__ + "." + python_enum_name )
478483
479484 return cls ._gimpenums_names_map
480485
@@ -485,7 +490,8 @@ def _pythonize_enum_names(cls, enums):
485490
486491 for enum_string in enum_strings :
487492 enum_string_components = re .split (r"^([A-Z][A-Z0-9-]+) *(\([0-9]+\))$" , enum_string )
488- enum_string_components = [component for component in enum_string_components if component ]
493+ enum_string_components = [
494+ component for component in enum_string_components if component ]
489495
490496 if len (enum_string_components ) == 2 :
491497 enum_name , enum_number_string = enum_string_components
0 commit comments