Skip to content

Commit 32ef6cd

Browse files
committed
Remove trailing whitespace.
1 parent 2ff9300 commit 32ef6cd

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

roundup/mailgw.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ def check_subject(self):
537537
def parse_subject(self):
538538
''' Matches subjects like:
539539
Re: "[issue1234] title of issue [status=resolved]"
540-
540+
541541
Each part of the subject is matched, stored, then removed from the
542542
start of the subject string as needed. The stored values are then
543543
returned
@@ -610,11 +610,11 @@ def parse_subject(self):
610610
if self.matches['quote'] and not self.matches['argswhole'] \
611611
and self.matches['title'].endswith('"'):
612612
self.matches['title'] = self.matches['title'][:-1]
613-
613+
614614
def rego_confirm(self):
615615
''' Check for registration OTK and confirm the registration if found
616616
'''
617-
617+
618618
if self.config['EMAIL_REGISTRATION_CONFIRMATION']:
619619
otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
620620
otk = otk_re.search(self.matches['title'] or '')
@@ -700,14 +700,14 @@ def get_classname(self):
700700
""") % locals())
701701
# get the class properties
702702
self.properties = self.cl.getprops()
703-
703+
704704

705705
def get_nodeid(self):
706706
''' Determine the nodeid from the message and return it if found
707707
'''
708708
title = self.matches['title']
709709
subject = self.subject
710-
710+
711711
if self.pfxmode == 'none':
712712
nodeid = None
713713
else:
@@ -880,10 +880,10 @@ def get_props(self):
880880
''' Generate all the props for the new/updated node and return them
881881
'''
882882
subject = self.subject
883-
883+
884884
# get the commandline arguments for issues
885885
issue_props = self.mailgw.get_class_arguments('issue', self.classname)
886-
886+
887887
#
888888
# handle the subject argument list
889889
#
@@ -892,11 +892,11 @@ def get_props(self):
892892
args = self.matches['args']
893893
argswhole = self.matches['argswhole']
894894
title = self.matches['title']
895-
896-
# Reform the title
895+
896+
# Reform the title
897897
if self.matches['nodeid'] and self.nodeid is None:
898898
title = subject
899-
899+
900900
if args:
901901
if self.sfxmode == 'none':
902902
title += ' ' + argswhole
@@ -993,7 +993,7 @@ def pgp_role():
993993
# something failed with the message decryption/sig
994994
# chain. Pass the error up.
995995
raise
996-
# store the decrypted message
996+
# store the decrypted message
997997
self.message = message
998998
elif pgp_role():
999999
raise MailUsageError(_("""
@@ -1059,7 +1059,7 @@ def create_msg(self):
10591059
return
10601060
msg_props = self.mailgw.get_class_arguments('msg')
10611061
self.msg_props.update (msg_props)
1062-
1062+
10631063
# Get the message ids
10641064
inreplyto = self.message.get_header('in-reply-to') or ''
10651065
messageid = self.message.get_header('message-id')
@@ -1068,7 +1068,7 @@ def create_msg(self):
10681068
messageid = "<%s.%s.%s%s@%s>"%(time.time(),
10691069
b2s(base64.b32encode(random_.token_bytes(10))),
10701070
self.classname, self.nodeid, self.config['MAIL_DOMAIN'])
1071-
1071+
10721072
if self.content is None:
10731073
raise MailUsageError(_("""
10741074
Roundup requires the submission to be plain text. The message parser could
@@ -1110,7 +1110,7 @@ def create_msg(self):
11101110
self.props['messages'] = [message_id]
11111111

11121112
def create_node(self):
1113-
''' Create/update a node using self.props
1113+
''' Create/update a node using self.props
11141114
'''
11151115
classname = self.classname
11161116
try:
@@ -1590,7 +1590,7 @@ def get_class_arguments(self, class_type, classname=None):
15901590

15911591
classname = classname or class_type
15921592
cls_lookup = { 'issue' : classname }
1593-
1593+
15941594
# Allow other issue-type classes -- take the real classname from
15951595
# previous parsing-steps of the message:
15961596
clsname = cls_lookup.get (class_type, class_type)
@@ -1605,21 +1605,21 @@ def get_class_arguments(self, class_type, classname=None):
16051605
%(mailadmin)s and have them fix the incorrect class specified as:
16061606
%(clsname)s
16071607
""") % locals())
1608-
1608+
16091609
if self.arguments:
16101610
# The default type on the commandline is msg
16111611
if class_type == 'msg':
16121612
current_type = class_type
16131613
else:
16141614
current_type = None
1615-
1615+
16161616
# Handle the arguments specified by the email gateway command line.
16171617
# We do this by looping over the list of self.arguments looking for
16181618
# a -C to match the class we want, then use the -S setting string.
16191619
for option, propstring in self.arguments:
16201620
if option in ( '-C', '--class'):
16211621
current_type = propstring.strip()
1622-
1622+
16231623
if current_type != class_type:
16241624
current_type = None
16251625

0 commit comments

Comments
 (0)