Skip to content

Commit a9affe0

Browse files
degaudendegauden
committed
Fix a few PyDev warnings
1 parent d9ea8f0 commit a9affe0

11 files changed

Lines changed: 87 additions & 98 deletions

File tree

‎ElementsExamples/python/ElementsExamples/PythonModuleExample.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ class ClassExample(object):
66
@brief This is an example of the most basic Python class
77
"""
88
logger = log.getLogger('ClassExample')
9-
def __init__(self, list):
9+
def __init__(self, my_list):
1010
"""
1111
@brief Constructor
1212
"""
1313
self._m_i = 5
14-
self._m_list = list
14+
self._m_list = my_list
1515

1616
def sumListValues(self):
1717
"""
1818
@brief Method summing the elements of the list
1919
"""
20-
sum = 0
20+
my_sum = 0
2121
for element in self._m_list:
22-
sum += element
23-
return sum
22+
my_sum += element
23+
return my_sum
2424

2525

2626
@staticmethod
@@ -39,5 +39,3 @@ def product(first, second):
3939
The product of the two numbers
4040
"""
4141
return first * second
42-
43-

‎ElementsExamples/python/ElementsExamples/PythonProgramExample.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import os # for the path tools
2-
import argparse # for program options from configuration
3-
import ElementsKernel.Logging as log # for Elements logging support
1+
import argparse # for program options from configuration
2+
import ElementsKernel.Logging as log # for Elements logging support
43
from ElementsExamples.PythonModuleExample import ClassExample # for ClassExample
54

65
def defineSpecificProgramOptions():
@@ -43,18 +42,18 @@ def mainMethod(args):
4342
string_from_configuration = args.string_option
4443
logger.info('Example string : ' + string_from_configuration)
4544
second_element = args.int_list_option[1]
46-
logger.info('Second elements from the list : ' + str(second_element) )
45+
logger.info('Second elements from the list : ' + str(second_element))
4746

4847
#
4948
# Calling a static method
5049
#
5150
result = ClassExample.product(3, 4)
52-
logger.info('Static method result : ' + str(result) )
51+
logger.info('Static method result : ' + str(result))
5352

5453
#
5554
# Calling the constructor and a method member
5655
#
5756
example_object = ClassExample(args.int_list_option)
5857
logger.info('Sum of the list elements : ' + str(example_object.sumListValues()))
5958

60-
logger.info('Exiting ProgramExample mainMethod()')
59+
logger.info('Exiting ProgramExample mainMethod()')

‎ElementsExamples/python/ElementsExamples/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
from pkgutil import extend_path
2-
__path__ = extend_path(__path__, __name__)
2+
__path__ = extend_path(__path__, __name__) # @ReservedAssignment

‎ElementsKernel/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ elements_install_python_modules()
113113

114114
elements_add_test(CreateElementsProject COMMAND createElementsProject_test)
115115
elements_add_test(AddElementsModule COMMAND addElementsModule_test)
116-
elements_add_test(AddCcpClass COMMAND addCppClass_test)
117-
elements_add_test(AddCcpProgram COMMAND addCppProgram_test)
116+
elements_add_test(AddCppClass COMMAND addCppClass_test)
117+
elements_add_test(AddCppProgram COMMAND addCppProgram_test)
118118
elements_add_test(AddPythonModule COMMAND addPythonModule_test)
119119
elements_add_test(AddPythonProgram COMMAND addPythonProgram_test)

‎ElementsKernel/python/ElementsKernel/AddCppClass.py‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import os
1313
import time
1414
import ElementsKernel.ProjectCommonRoutines as epcr
15-
import ElementsKernel.parseCmakeLists as pcl
15+
import ElementsKernel.ParseCmakeLists as pcl
1616
import ElementsKernel.Logging as log
1717

1818
logger = log.getLogger('AddCppClass')
@@ -35,7 +35,7 @@ def getClassName(str_subdir_class):
3535
"""
3636
name_list = str_subdir_class.split(os.path.sep)
3737
className = name_list[-1]
38-
subdir = str_subdir_class.replace(className,'')
38+
subdir = str_subdir_class.replace(className, '')
3939
# Remove end slash
4040
subdir = subdir[:-1]
4141
logger.info('# Class name: %s' % className)
@@ -79,9 +79,9 @@ def substituteStringsInDotH(file_path, class_name, module_name, subdir):
7979
# Make some substitutions
8080
file_name_str = os.path.join(module_name, subdir, class_name + '.h')
8181
define_words_str = '_' + file_name_str
82-
define_words_str = define_words_str.replace(H_TEMPLATE_FILE, class_name +'.h')
83-
define_words_str = define_words_str.replace('.','_')
84-
define_words_str = (define_words_str.replace(os.path.sep,'_')).upper()
82+
define_words_str = define_words_str.replace(H_TEMPLATE_FILE, class_name + '.h')
83+
define_words_str = define_words_str.replace('.', '_')
84+
define_words_str = (define_words_str.replace(os.path.sep, '_')).upper()
8585
new_data = data % {"FILE": file_name_str,
8686
"DATE": date_str,
8787
"AUTHOR": author_str,
@@ -110,7 +110,7 @@ def substituteStringsInDotCpp(file_path, class_name, module_name, subdir):
110110
f = open(template_file, 'r')
111111
data = f.read()
112112
author_str = epcr.getAuthor()
113-
date_str = time.strftime("%x")
113+
date_str = time.strftime("%x")
114114
# This avoid double slashes
115115
ossep2 = os.sep
116116
if not subdir:
@@ -146,8 +146,8 @@ def substituteStringsInUnitTestFile(file_path, class_name, module_name, subdir):
146146
f = open(template_file, 'r')
147147
data = f.read()
148148
author_str = epcr.getAuthor()
149-
date_str = time.strftime("%x")
150-
file_name_str = os.path.join('tests','src',class_name + '_test.cpp')
149+
date_str = time.strftime("%x")
150+
file_name_str = os.path.join('tests', 'src', class_name + '_test.cpp')
151151
new_data = data % {"FILE": file_name_str,
152152
"DATE": date_str,
153153
"AUTHOR": author_str,
@@ -208,7 +208,7 @@ def updateCmakeListsFile(module_dir, module_name, subdir, class_name,
208208
# Update elements_add_library macro
209209
if module_name:
210210
source = 'src' + os.sep + 'lib' + os.sep + subdir + '*.cpp'
211-
existing = [x for x in cmake_object.elements_add_library_list if x.name==module_name]
211+
existing = [x for x in cmake_object.elements_add_library_list if x.name == module_name]
212212
link_libs = []
213213
if elements_dep_list:
214214
link_libs = link_libs + elements_dep_list
@@ -221,18 +221,18 @@ def updateCmakeListsFile(module_dir, module_name, subdir, class_name,
221221
if not lib in existing[0].link_libraries_list:
222222
existing[0].link_libraries_list.append(lib)
223223
else:
224-
source_list = [source]
225-
include_dirs_list = []
224+
source_list = [source]
225+
include_dirs_list = []
226226
public_headers_list = [module_name]
227-
lib_object = pcl.ElementsAddLibrary(module_name, source_list,
227+
lib_object = pcl.ElementsAddLibrary(module_name, source_list,
228228
link_libs, include_dirs_list,
229229
public_headers_list)
230230
cmake_object.elements_add_library_list.append(lib_object)
231231

232232
# Add unit test
233233
source_name = 'tests' + os.sep + 'src' + os.sep + subdir + \
234234
class_name + '_test.cpp'
235-
unittest_object = pcl.ElementsAddUnitTest(class_name+'_test',
235+
unittest_object = pcl.ElementsAddUnitTest(class_name + '_test',
236236
[source_name], [module_name], [], 'Boost')
237237
cmake_object.elements_add_unit_test_list.append(unittest_object)
238238

@@ -248,8 +248,8 @@ def isClassFileAlreadyExist(class_name, module_dir, module_name, subdir):
248248
Check if the class file does not already exist
249249
"""
250250
script_goes_on = True
251-
module_path = os.path.join(module_dir, module_name, subdir)
252-
file_name = class_name + '.h'
251+
module_path = os.path.join(module_dir, module_name, subdir)
252+
file_name = class_name + '.h'
253253
file_name_path = os.path.join(module_path, file_name)
254254
if os.path.exists(file_name_path):
255255
script_goes_on = False
@@ -265,20 +265,19 @@ def createCppClass(module_dir, module_name, subdir, class_name, elements_dep_lis
265265
"""
266266
Create all necessary files for a cpp class
267267
"""
268-
script_goes_on = True
269268

270269
# Check the class does not exist already
271-
script_goes_on = isClassFileAlreadyExist(class_name, module_dir, module_name,
270+
script_goes_on = isClassFileAlreadyExist(class_name, module_dir, module_name,
272271
subdir)
273272
if script_goes_on:
274273

275274
createDirectories(module_dir, module_name, subdir)
276275
class_h_path = os.path.join(module_dir, module_name, subdir)
277276
script_goes_on = epcr.copyAuxFile(class_h_path, H_TEMPLATE_FILE_IN)
278-
class_cpp_path = os.path.join(module_dir,'src','lib', subdir)
277+
class_cpp_path = os.path.join(module_dir, 'src', 'lib', subdir)
279278
if script_goes_on:
280279
script_goes_on = epcr.copyAuxFile(class_cpp_path, CPP_TEMPLATE_FILE_IN)
281-
unittest_path = os.path.join(module_dir,'tests','src', subdir)
280+
unittest_path = os.path.join(module_dir, 'tests', 'src', subdir)
282281
if script_goes_on:
283282
script_goes_on = epcr.copyAuxFile(unittest_path, UNITTEST_TEMPLATE_FILE_IN)
284283
if script_goes_on:
@@ -302,14 +301,14 @@ def defineSpecificProgramOptions():
302301
the [-extd] option for external dependency.
303302
"""
304303
parser = argparse.ArgumentParser(description=description)
305-
parser.add_argument('class_name', metavar='class-name',
306-
type=str,
304+
parser.add_argument('class_name', metavar='class-name',
305+
type=str,
307306
help='Class name')
308-
parser.add_argument('-ed', '--elements-dependency', metavar='module_name',
307+
parser.add_argument('-ed', '--elements-dependency', metavar='module_name',
309308
action='append', type=str,
310309
help='Dependency module name e.g. "-ed ElementsKernel"')
311310
parser.add_argument('-extd', '--external-dependency', metavar='library_name',
312-
action='append',type=str,
311+
action='append', type=str,
313312
help='External dependency library name e.g. "-extd ElementsKernel"')
314313

315314
return parser
@@ -325,11 +324,11 @@ def mainMethod(args):
325324

326325
try:
327326
# True: no error occured
328-
script_goes_on = True
327+
script_goes_on = True
329328

330-
elements_dep_list = args.elements_dependency
331-
library_dep_list = args.external_dependency
332-
(subdir,class_name) = getClassName(args.class_name)
329+
elements_dep_list = args.elements_dependency
330+
library_dep_list = args.external_dependency
331+
(subdir, class_name) = getClassName(args.class_name)
333332

334333
# Default is the current directory
335334
module_dir = os.getcwd()
@@ -351,7 +350,7 @@ def mainMethod(args):
351350
logger.info('# <%s> class successfully created in <%s>.' %
352351
(class_name, module_dir + os.sep + subdir))
353352
# Remove backup file
354-
epcr.deleteFile(os.path.join(module_dir, CMAKE_LISTS_FILE)+'~')
353+
epcr.deleteFile(os.path.join(module_dir, CMAKE_LISTS_FILE) + '~')
355354
logger.info('# Script over.')
356355
else:
357356
logger.error('# Script aborted!')

‎ElementsKernel/python/ElementsKernel/AddCppProgram.py‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010

1111
import argparse
1212
import os
13-
import re
14-
import shutil
1513
import time
1614
import ElementsKernel.ProjectCommonRoutines as epcr
17-
import ElementsKernel.parseCmakeLists as pcl
15+
import ElementsKernel.ParseCmakeLists as pcl
1816
import ElementsKernel.Logging as log
1917

2018
logger = log.getLogger('AddCppProgram')
@@ -74,7 +72,7 @@ def substituteStringsInProgramFile(file_path, program_name, module_name):
7472
data = f.read()
7573
# Format all dependent projects
7674
# We put by default Elements dependency if no one is given
77-
date_str = time.strftime("%x")
75+
date_str = time.strftime("%x")
7876
author_str = epcr.getAuthor()
7977
# Make some substitutions
8078
file_name_str = os.path.join('src', 'program', program_name + '.cpp')
@@ -128,16 +126,16 @@ def updateCmakeListsFile(module_dir, module_name, program_name,
128126
cmake_object.elements_install_conf_files = 'elements_install_conf_files()'
129127

130128
# Update elements_add_executable macro
131-
source = 'src' + os.sep + 'program' + os.sep + program_name+ '.cpp'
132-
existing_exe = [x for x in cmake_object.elements_add_executable_list if x.name==program_name]
133-
existing_add_lib = [x for x in cmake_object.elements_add_library_list if x.name==module_name]
129+
source = 'src' + os.sep + 'program' + os.sep + program_name + '.cpp'
130+
existing_exe = [x for x in cmake_object.elements_add_executable_list if x.name == program_name]
131+
existing_add_lib = [x for x in cmake_object.elements_add_library_list if x.name == module_name]
134132
link_libs = ['ElementsKernel']
135133
if module_dep_list:
136-
link_libs = link_libs + module_dep_list
134+
link_libs = link_libs + module_dep_list
137135
if existing_add_lib:
138136
link_libs += [module_name]
139137
if library_dep_list:
140-
link_libs = link_libs + library_dep_list
138+
link_libs = link_libs + library_dep_list
141139
if existing_exe:
142140
for lib in link_libs:
143141
if not lib in existing_exe[0].link_libraries_list:
@@ -160,9 +158,8 @@ def createCppProgram(module_dir, module_name, program_name, module_dep_list,
160158
"""
161159
Creates all necessary files for a program
162160
"""
163-
script_goes_on = True
164161
createDirectories(module_dir, module_name)
165-
program_path = os.path.join(module_dir,'src','program')
162+
program_path = os.path.join(module_dir, 'src', 'program')
166163
script_goes_on = epcr.copyAuxFile(program_path, PROGRAM_TEMPLATE_FILE_IN)
167164
substituteStringsInProgramFile(program_path, program_name, module_name)
168165
addConfFile(module_dir, module_name, program_name)
@@ -176,13 +173,13 @@ def defineSpecificProgramOptions():
176173
description = """
177174
"""
178175
parser = argparse.ArgumentParser(description=description)
179-
parser.add_argument('program_name', metavar='program-name',
180-
type=str,
176+
parser.add_argument('program_name', metavar='program-name',
177+
type=str,
181178
help='Program name')
182179
parser.add_argument('-md', '--module-dependency', metavar='module_name',
183180
action='append', type=str,
184181
help='Dependency module name e.g."-md ElementsKernel"')
185-
parser.add_argument('-ld', '--library-dependency', metavar='library_name',
182+
parser.add_argument('-ld', '--library-dependency', metavar='library_name',
186183
action='append', type=str,
187184
help='Dependency library name e.g."-ld ElementsKernel"')
188185

@@ -198,10 +195,10 @@ def mainMethod(args):
198195

199196
try:
200197
# True: no error occured
201-
script_goes_on = True
198+
script_goes_on = True
202199

203200
program_name = args.program_name
204-
module_list = args.module_dependency
201+
module_list = args.module_dependency
205202
library_list = args.library_dependency
206203

207204
# Default is the current directory
@@ -212,24 +209,24 @@ def mainMethod(args):
212209
# We absolutely need a Elements cmake file
213210
script_goes_on, module_name = epcr.isElementsModuleExist(current_dir)
214211

215-
program_file_path = os.path.join(current_dir, 'src', 'program',
216-
program_name +'.cpp')
212+
program_file_path = os.path.join(current_dir, 'src', 'program',
213+
program_name + '.cpp')
217214
if script_goes_on:
218-
script_goes_on = epcr.isFileAlreadyExist(program_file_path,
215+
script_goes_on = epcr.isFileAlreadyExist(program_file_path,
219216
program_name)
220217
# Check program name is valid
221218
if script_goes_on:
222219
script_goes_on = epcr.isNameAndVersionValid(program_name, '1.0')
223220

224-
# Check aux file exist
221+
# Check aux file exist
225222
if script_goes_on:
226223
script_goes_on = epcr.isAuxFileExist(PROGRAM_TEMPLATE_FILE_IN)
227224

228225
if script_goes_on and createCppProgram(current_dir, module_name, program_name, module_list, library_list):
229226
logger.info('# <%s> program successfully created in <%s>.' %
230-
(program_name, current_dir + os.sep + 'src'+ os.sep + 'program'))
227+
(program_name, current_dir + os.sep + 'src' + os.sep + 'program'))
231228
# Remove backup file
232-
epcr.deleteFile(os.path.join(current_dir, CMAKE_LISTS_FILE)+'~')
229+
epcr.deleteFile(os.path.join(current_dir, CMAKE_LISTS_FILE) + '~')
233230
logger.info('# Script over.')
234231
else:
235232
logger.error('# Script aborted!')

‎ElementsKernel/python/ElementsKernel/AddModule.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import argparse
1212
import os
1313
import ElementsKernel.ProjectCommonRoutines as epcr
14-
import ElementsKernel.parseCmakeLists as pcl
14+
import ElementsKernel.ParseCmakeLists as pcl
1515
import ElementsKernel.Logging as log
1616

1717
logger = log.getLogger('AddElementsModule')
@@ -146,10 +146,10 @@ def defineSpecificProgramOptions():
146146
for you. Use the [-md] option for the module dependency.
147147
"""
148148
parser = argparse.ArgumentParser(description=description)
149-
parser.add_argument('module_name', metavar='module-name',
150-
type=str,
149+
parser.add_argument('module_name', metavar='module-name',
150+
type=str,
151151
help='Module name')
152-
parser.add_argument('-md', '--module-dependency', metavar='module_name',
152+
parser.add_argument('-md', '--module-dependency', metavar='module_name',
153153
action='append', type=str,
154154
help='Dependency module name e.g "-md ElementsKernel"')
155155

0 commit comments

Comments
 (0)