Merge pull request #315 from TeamMsgExtractor/next-release

TheElementalOfDestruction · web-flow · commit 53b784519ec0 · 2022-12-03T00:12:11.000-08:00
Version 0.38.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+**v0.38.3**
+* Fixed issues in HTML generation that caused line breaks to be omitted from large sections of the text.
+* Fixed issues with requirements file.
+
 **v0.38.2**
 * Fixed new `NameError` accidentally introduced in the previous version.
 
diff --git a/README.rst b/README.rst
@@ -233,8 +233,8 @@ your access to the newest major version of extract-msg.
 .. |License: GPL v3| image:: https://img.shields.io/badge/License-GPLv3-blue.svg
    :target: LICENSE.txt
 
-.. |PyPI3| image:: https://img.shields.io/badge/pypi-0.38.2-blue.svg
-   :target: https://pypi.org/project/extract-msg/0.38.2/
+.. |PyPI3| image:: https://img.shields.io/badge/pypi-0.38.3-blue.svg
+   :target: https://pypi.org/project/extract-msg/0.38.3/
 
 .. |PyPI2| image:: https://img.shields.io/badge/python-3.6+-brightgreen.svg
    :target: https://www.python.org/downloads/release/python-367/
diff --git a/extract_msg/__init__.py b/extract_msg/__init__.py
@@ -27,8 +27,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 __author__ = 'Destiny Peterson & Matthew Walker'
-__date__ = '2022-12-01'
-__version__ = '0.38.2'
+__date__ = '2022-12-03'
+__version__ = '0.38.3'
 
 import logging
 
diff --git a/extract_msg/message_base.py b/extract_msg/message_base.py
@@ -1160,7 +1160,7 @@ def htmlBody(self) -> Optional[bytes]:
             if not self._htmlBody and self.body:
                 # Convert the plain text body to html.
                 logger.info('HTML body was not found, attempting to generate from plain text body.')
-                correctedBody = html.escape(self.body).replace('\r', '').replace('\n', '</br>')
+                correctedBody = html.escape(self.body).replace('\r', '').replace('\n', '<br />')
                 self._htmlBody = f'<html><body>{correctedBody}</body></head>'.encode('utf-8')
 
             if not self._htmlBody:
@@ -1312,7 +1312,7 @@ def rtfEncapInjectableHeader(self) -> str:
         """
         prefix = r'\htmlrtf {\htmlrtf0 {\*\htmltag96 <div>}{\*\htmltag96 <div>}{\*\htmltag64 <p class=MsoNormal>}'
         suffix = r'{\*\htmltag244 <o:p>}{\*\htmlrag252 </o:p>}\htmlrtf \par\par\htmlrtf0 {\*\htmltag72 </p>}{\*\htmltag104 </div>}{\*\htmltag104 </div>}\htmlrtf }\htmlrtf0 '
-        joinStr = r'{\*\htmltag116 <br>}\htmlrtf \line\htmlrtf0 '
+        joinStr = r'{\*\htmltag116 <br />}\htmlrtf \line\htmlrtf0 '
         formatter = (lambda name, value : fr'\htmlrtf {{\b\htmlrtf0{{\*\htmltag84 <b>}}{name}: {{\*\htmltag92 </b>}}\htmlrtf \b0\htmlrtf0 {inputToString(rtfSanitizeHtml(value), self.stringEncoding)}\htmlrtf }}\htmlrtf0')
 
         return self.getInjectableHeader(prefix, joinStr, suffix, formatter)
diff --git a/extract_msg/message_signed_base.py b/extract_msg/message_signed_base.py
@@ -130,7 +130,7 @@ def htmlBody(self) -> Optional[bytes]:
             elif self.body:
                 # Convert the plain text body to html.
                 logger.info('HTML body was not found, attempting to generate from plain text body.')
-                correctedBody = html.escpae(self.body).replace('\r', '').replace('\n', '</br>')
+                correctedBody = html.escpae(self.body).replace('\r', '').replace('\n', '<br />')
                 self._htmlBody = f'<html><body>{correctedBody}</body></head>'.encode('utf-8')
             else:
                 logger.info('HTML body could not be found nor generated.')
diff --git a/requirements.txt b/requirements.txt
@@ -1,11 +1,11 @@
 
 # First level requirements
-imapclient>=2.3.0<3
+imapclient>=2.3.0,<3
 olefile==0.46
 tzlocal==4.2
 compressed_rtf==1.0.6
 ebcdic==1.1.1
-beautifulsoup4>=4.11.1<4.12
+beautifulsoup4>=4.11.1,<4.12
 RTFDE==0.0.2
-chardet>=4.0.0<6
+chardet>=4.0.0,<6
 red-black-tree-mod==1.20
