Skip to content

FIX: minor issues related to pep8 and pylint #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FIX: minor issues related to pep8 and pylint #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions email_reply_parser/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,17 @@ class EmailMessage(object):
QUOTED_REGEX = re.compile(r'(>+)')
HEADER_REGEX = re.compile(r'^\*?(From|Sent|To|Subject):\*? .+')
_MULTI_QUOTE_HDR_REGEX = r'(?!On.*On\s.+?wrote:)(On\s(.+?)wrote:)'
MULTI_QUOTE_HDR_REGEX = re.compile(_MULTI_QUOTE_HDR_REGEX, re.DOTALL | re.MULTILINE)
MULTI_QUOTE_HDR_REGEX_MULTILINE = re.compile(_MULTI_QUOTE_HDR_REGEX, re.DOTALL)
MULTI_QUOTE_HDR_REGEX = re.compile(
_MULTI_QUOTE_HDR_REGEX, re.DOTALL | re.MULTILINE)
MULTI_QUOTE_HDR_REGEX_MULTILINE = re.compile(
_MULTI_QUOTE_HDR_REGEX, re.DOTALL)

def __init__(self, text):
self.fragments = []
self.fragment = None
self.text = text.replace('\r\n', '\n')
self.found_visible = False
self.lines = None

def read(self):
""" Creates new fragment for each line
Expand All @@ -59,13 +62,16 @@ def read(self):

self.found_visible = False

is_multi_quote_header = self.MULTI_QUOTE_HDR_REGEX_MULTILINE.search(self.text)
is_multi_quote_header = self.MULTI_QUOTE_HDR_REGEX_MULTILINE.search(
self.text)
if is_multi_quote_header:
self.text = self.MULTI_QUOTE_HDR_REGEX.sub(is_multi_quote_header.groups()[0].replace('\n', ''), self.text)
self.text = self.MULTI_QUOTE_HDR_REGEX.sub(is_multi_quote_header.groups()[
0].replace('\n', ''), self.text)

# Fix any outlook style replies, with the reply immediately above the signature boundary line
# See email_2_2.txt for an example
self.text = re.sub('([^\n])(?=\n ?[_-]{7,})', '\\1\n', self.text, re.MULTILINE)
self.text = re.sub(
'([^\n])(?=\n ?[_-]{7,})', '\\1\n', self.text, re.MULTILINE)

self.lines = self.text.split('\n')
self.lines.reverse()
Expand Down Expand Up @@ -96,16 +102,18 @@ def _scan_line(self, line):
"""
is_quote_header = self.QUOTE_HDR_REGEX.match(line) is not None
is_quoted = self.QUOTED_REGEX.match(line) is not None
is_header = is_quote_header or self.HEADER_REGEX.match(line) is not None
is_header = is_quote_header or self.HEADER_REGEX.match(
line) is not None
is_line_empty = len(line.strip()) == 0

if self.fragment and len(line.strip()) == 0:
if self.fragment and is_line_empty:
if self.SIG_REGEX.match(self.fragment.lines[-1].strip()):
self.fragment.signature = True
self._finish_fragment()

if self.fragment \
and ((self.fragment.headers == is_header and self.fragment.quoted == is_quoted) or
(self.fragment.quoted and (is_quote_header or len(line.strip()) == 0))):
(self.fragment.quoted and (is_quote_header or is_line_empty))):

self.fragment.lines.append(line)
else:
Expand Down Expand Up @@ -134,10 +142,10 @@ def _finish_fragment(self):
for f in self.fragments:
f.hidden = True
if not self.found_visible:
if self.fragment.quoted \
or self.fragment.headers \
or self.fragment.signature \
or (len(self.fragment.content.strip()) == 0):
if any([self.fragment.quoted,
self.fragment.headers,
self.fragment.signature,
(len(self.fragment.content.strip()) == 0)]):

self.fragment.hidden = True
else:
Expand Down