Commit 60cb8cafb8ca38d330b1ecc021a616479c532e4e
Merge remote-tracking branch 'origin/master'
Showing
1 changed file
with
1 additions
and
12 deletions
oletools/mraptor_milter.py
| @@ -98,18 +98,7 @@ from oletools import olevba, mraptor | @@ -98,18 +98,7 @@ from oletools import olevba, mraptor | ||
| 98 | 98 | ||
| 99 | from Milter.utils import parse_addr | 99 | from Milter.utils import parse_addr |
| 100 | 100 | ||
| 101 | -if sys.version_info[0] <= 2: | ||
| 102 | - # Python 2.x | ||
| 103 | - if sys.version_info[1] <= 6: | ||
| 104 | - # Python 2.6 | ||
| 105 | - # use is_zipfile backported from Python 2.7: | ||
| 106 | - from oletools.thirdparty.zipfile27 import is_zipfile | ||
| 107 | - else: | ||
| 108 | - # Python 2.7 | ||
| 109 | - from zipfile import is_zipfile | ||
| 110 | -else: | ||
| 111 | - # Python 3.x+ | ||
| 112 | - from zipfile import is_zipfile | 101 | +from zipfile import is_zipfile |
| 113 | 102 | ||
| 114 | 103 | ||
| 115 | 104 |