0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI.pyw: fixed regexps not being handled correctly on non Windows systems

Browse source 
This fix relies on the fact that argparse doesn't require the equal sign any more.
This commit is contained in:
Elvish_Hunter 2015-10-20 11:41:23 +02:00
parent 491ba7924f
commit e07de1bf48
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
data/tools/GUI.pyw Executable file → Normal file
View file

@ -1091,21 +1091,26 @@ wmllint will be run only on the Wesnoth core directory""")
if self.wmlscope_tab.progress_variable.get():
wmlscope_command_string.append("--progress")
if self.wmlscope_tab.exclude_variable.get():
wmlscope_command_string.append('--exclude="{0}"'.format(self.wmlscope_tab.exclude_regexp.get()))
wmlscope_command_string.append("--exclude")
wmlscope_command_string.append(self.wmlscope_tab.exclude_regexp.get())
if self.wmlscope_tab.from_variable.get():
wmlscope_command_string.append('--from="{0}"'.format(self.wmlscope_tab.from_regexp.get()))
wmlscope_command_string.append("--from")
wmlscope_command_string.append(self.wmlscope_tab.from_regexp.get())
if self.wmlscope_tab.refcount_variable.get():
try:
wmlscope_command_string.append("--refcount=" + str(self.wmlscope_tab.refcount_number.get()))
wmlscope_command_string.append("--refcount")
wmlscope_command_string.append(str(self.wmlscope_tab.refcount_number.get()))
except ValueError as error:
# normally it should be impossible to raise this exception
# due to the fact that the Spinbox is read-only
showerror("Error","""You typed an invalid value. Value must be an integer in the range 0-999""")
return
if self.wmlscope_tab.typelist_variable.get():
wmlscope_command_string.append('--typelist="{0}"'.format(self.wmlscope_tab.typelist_string.get()))
wmlscope_command_string.append("--typelist")
wmlscope_command_string.append(self.wmlscope_tab.typelist_string.get())
if self.wmlscope_tab.force_variable.get():
wmlscope_command_string.append('--force-used="{0}"'.format(self.wmlscope_tab.force_regexp.get()))
wmlscope_command_string.append("--force-used")
wmlscope_command_string.append(self.wmlscope_tab.force_regexp.get())
wmlscope_command_string.append(WESNOTH_CORE_DIR)
umc_dir=self.dir_variable.get()
if os.path.exists(umc_dir): # add-on exists
@ -1144,7 +1149,8 @@ wmlscope will be run only on the Wesnoth core directory""")
for n in range(verbosity):
wmlindent_command_string.append("-v")
if self.wmlindent_tab.exclude_variable.get():
wmlindent_command_string.append('--exclude="{0}"'.format(self.wmlindent_tab.regexp_variable.get()))
wmlindent_command_string.append("--exclude")
wmlindent_command_string.append(self.wmlindent_tab.regexp_variable.get())
if self.wmlindent_tab.quiet_variable.get():
wmlindent_command_string.append("--quiet")
umc_dir=self.dir_variable.get()