space around + and single quote non interpolated strings

This commit is contained in:
Derek DeJonghe
2018-05-25 15:07:36 -04:00
parent 8a7bcd4764
commit b989cf6a04

View File

@ -42,7 +42,7 @@ class SemVer(object):
br = b.stdout.read().decode('utf-8') br = b.stdout.read().decode('utf-8')
#remove newline #remove newline
branch=br.rstrip() branch=br.rstrip()
print("Main branch is "+branch) print('Main branch is ' + branch)
matches = self.GET_COMMIT_MESSAGE.search(message) matches = self.GET_COMMIT_MESSAGE.search(message)
if matches: if matches:
if str(matches.group(4)) == branch: if str(matches.group(4)) == branch:
@ -50,16 +50,11 @@ class SemVer(object):
else: else:
self.merged_branch = matches.group(4) self.merged_branch = matches.group(4)
self.main_branch = branch self.main_branch = branch
#print("group1 "+matches.group(1))
#print("group2 "+matches.group(2))
#print("group3 "+matches.group(3))
#print("group4 "+matches.group(4))
return bool(matches) return bool(matches)
# based on branches involved see what type of versioning should be done # based on branches involved see what type of versioning should be done
def get_version_type(self): def get_version_type(self):
print("Merged branch is "+self.merged_branch) print('Merged branch is ' + self.merged_branch)
for prefix in self.major_branches: for prefix in self.major_branches:
if self.merged_branch.startswith(prefix + '/'): if self.merged_branch.startswith(prefix + '/'):
self.version_type = 'major' self.version_type = 'major'