diff options
Diffstat (limited to 'libmat2')
| -rw-r--r-- | libmat2/office.py | 9 | ||||
| -rw-r--r-- | libmat2/pdf.py | 2 | ||||
| -rw-r--r-- | libmat2/torrent.py | 7 |
3 files changed, 7 insertions, 11 deletions
diff --git a/libmat2/office.py b/libmat2/office.py index 62d0395..4881253 100644 --- a/libmat2/office.py +++ b/libmat2/office.py | |||
| @@ -19,8 +19,6 @@ from . import abstract, parser_factory | |||
| 19 | assert Set | 19 | assert Set |
| 20 | assert Pattern | 20 | assert Pattern |
| 21 | 21 | ||
| 22 | logging.basicConfig(level=logging.ERROR) | ||
| 23 | |||
| 24 | def _parse_xml(full_path: str): | 22 | def _parse_xml(full_path: str): |
| 25 | """ This function parse XML, with namespace support. """ | 23 | """ This function parse XML, with namespace support. """ |
| 26 | 24 | ||
| @@ -96,7 +94,8 @@ class ArchiveBasedAbstractParser(abstract.AbstractParser): | |||
| 96 | if self._specific_cleanup(full_path) is False: | 94 | if self._specific_cleanup(full_path) is False: |
| 97 | shutil.rmtree(temp_folder) | 95 | shutil.rmtree(temp_folder) |
| 98 | os.remove(self.output_filename) | 96 | os.remove(self.output_filename) |
| 99 | logging.info("Something went wrong during deep cleaning of %s", item.filename) | 97 | logging.warning("Something went wrong during deep cleaning of %s", |
| 98 | item.filename) | ||
| 100 | return False | 99 | return False |
| 101 | 100 | ||
| 102 | if item.filename in self.files_to_keep: | 101 | if item.filename in self.files_to_keep: |
| @@ -110,7 +109,9 @@ class ArchiveBasedAbstractParser(abstract.AbstractParser): | |||
| 110 | if not tmp_parser: | 109 | if not tmp_parser: |
| 111 | shutil.rmtree(temp_folder) | 110 | shutil.rmtree(temp_folder) |
| 112 | os.remove(self.output_filename) | 111 | os.remove(self.output_filename) |
| 113 | logging.info("%s's format (%s) isn't supported", item.filename, mtype) | 112 | logging.error("in file %s, element %s's format (%s) " + |
| 113 | "isn't supported", | ||
| 114 | self.filename, item.filename, mtype) | ||
| 114 | return False | 115 | return False |
| 115 | tmp_parser.remove_all() | 116 | tmp_parser.remove_all() |
| 116 | os.rename(tmp_parser.output_filename, full_path) | 117 | os.rename(tmp_parser.output_filename, full_path) |
diff --git a/libmat2/pdf.py b/libmat2/pdf.py index d3c4698..bc7c8a6 100644 --- a/libmat2/pdf.py +++ b/libmat2/pdf.py | |||
| @@ -16,8 +16,6 @@ from gi.repository import Poppler, GLib | |||
| 16 | 16 | ||
| 17 | from . import abstract | 17 | from . import abstract |
| 18 | 18 | ||
| 19 | logging.basicConfig(level=logging.ERROR) | ||
| 20 | |||
| 21 | poppler_version = Poppler.get_version() | 19 | poppler_version = Poppler.get_version() |
| 22 | if LooseVersion(poppler_version) < LooseVersion('0.46'): # pragma: no cover | 20 | if LooseVersion(poppler_version) < LooseVersion('0.46'): # pragma: no cover |
| 23 | raise ValueError("MAT2 needs at least Poppler version 0.46 to work. \ | 21 | raise ValueError("MAT2 needs at least Poppler version 0.46 to work. \ |
diff --git a/libmat2/torrent.py b/libmat2/torrent.py index 90f83f8..049807b 100644 --- a/libmat2/torrent.py +++ b/libmat2/torrent.py | |||
| @@ -3,9 +3,6 @@ from typing import Union, Tuple, Dict | |||
| 3 | 3 | ||
| 4 | from . import abstract | 4 | from . import abstract |
| 5 | 5 | ||
| 6 | logging.basicConfig(level=logging.ERROR) | ||
| 7 | |||
| 8 | |||
| 9 | class TorrentParser(abstract.AbstractParser): | 6 | class TorrentParser(abstract.AbstractParser): |
| 10 | mimetypes = {'application/x-bittorrent', } | 7 | mimetypes = {'application/x-bittorrent', } |
| 11 | whitelist = {b'announce', b'announce-list', b'info'} | 8 | whitelist = {b'announce', b'announce-list', b'info'} |
| @@ -123,9 +120,9 @@ class _BencodeHandler(object): | |||
| 123 | try: | 120 | try: |
| 124 | ret, trail = self.__decode_func[s[0]](s) | 121 | ret, trail = self.__decode_func[s[0]](s) |
| 125 | except (IndexError, KeyError, ValueError) as e: | 122 | except (IndexError, KeyError, ValueError) as e: |
| 126 | logging.debug("Not a valid bencoded string: %s", e) | 123 | logging.warning("Not a valid bencoded string: %s", e) |
| 127 | return None | 124 | return None |
| 128 | if trail != b'': | 125 | if trail != b'': |
| 129 | logging.debug("Invalid bencoded value (data after valid prefix)") | 126 | logging.warning("Invalid bencoded value (data after valid prefix)") |
| 130 | return None | 127 | return None |
| 131 | return ret | 128 | return ret |
