Skip to content

Commit d256fd8

Browse files
committed
[ftools] Further SIP API updates
1 parent 36e1b3b commit d256fd8

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

python/plugins/fTools/tools/ftools_utils.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -165,17 +165,17 @@ def testForUniqueness( fieldList1, fieldList2 ):
165165

166166
# Create a unique field name based on input field name
167167
def createUniqueFieldName( field ):
168-
check = field.name().right( 2 )
169-
shortName = field.name().left( 8 )
170-
if check.startsWith("_"):
171-
( val, test ) = check.right( 1 ).toInt()
172-
if test:
168+
check = field.name()[-2:]
169+
shortName = field.name()[:8]
170+
if check[0] == "_":
171+
try:
172+
val = int( check[-1:] )
173173
if val < 2:
174174
val = 2
175175
else:
176176
val = val + 1
177-
field.setName( shortName.left( len( shortName )-1 ) + unicode( val ) )
178-
else:
177+
field.setName( shortName[len( shortName )-1:] + unicode( val ) )
178+
except exceptions.ValueError:
179179
field.setName( shortName + "_2" )
180180
else:
181181
field.setName( shortName + "_2" )

0 commit comments

Comments
 (0)