You've created the constant CONTROL_CHARS but you've chosen not to use it on line 36. Perhaps you could use the constant and then just rstrip() to remove the rest instead of the '| +$'?
If you don't want to use it on line 36, then why not merge the CONTROL_CHARS and INVALID_FILE_CHARS into one regex for line 18? I don't think it would be an issue replacing the control characters with _'s instead of ''s, since they shouldn't be there anyway. -- https://code.launchpad.net/~phill-ridout/openlp/bug952533/+merge/98788 Your team OpenLP Core is subscribed to branch lp:openlp. _______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
