fix: windows log color issue

a1124510616 · Jan 20, 2022 · b5b11dc · b5b11dc
1 parent f96ed12
commit b5b11dc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -294,3 +294,7 @@ Cross-platform shell code generation
 * fix #254
 * fix urlparse fails with simple url
 * use pycryptodomex instead of pycryptodome, fix #255
+
+# version 1.8.11
+-----------------
+* fix windows log color issue #258
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ It comes with a powerful proof-of-concept engine, many nice features for the ult
 
 ## Requirements
 
-- Python 3.6+
+- Python 3.7+
 - Works on Linux, Windows, Mac OSX, BSD, etc.
 
 ## Installation

diff --git a/pocsuite3/__init__.py b/pocsuite3/__init__.py
@@ -1,5 +1,5 @@
 __title__ = 'pocsuite3'
-__version__ = '1.8.10'
+__version__ = '1.8.11'
 __author__ = 'Knownsec 404 Team'
 __author_email__ = '[email protected]'
 __license__ = 'GPLv2'

diff --git a/pocsuite3/lib/core/log.py b/pocsuite3/lib/core/log.py
@@ -9,7 +9,13 @@
 logging.addLevelName(CUSTOM_LOGGING.WARNING, "!")
 
 LOGGER = logging.getLogger("pocsuite")
-sys.stdout = open(sys.stdout.fileno(), mode='w', encoding='utf8', buffering=1)
+try:
+ # for python>=3.7
+ sys.stdout.reconfigure(encoding='utf-8')
+except AttributeError:
+ # https://www.macfreek.nl/memory/Encoding_of_Python_stdout
+ import codecs
+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer, 'strict')
 LOGGER_HANDLER = logging.StreamHandler(sys.stdout)
 PRIMARY_FMT = (
  "%(cyan)s[%(asctime)s] %(log_color)s[%(levelname)s]%(reset)s %(message)s"

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def find_packages(where='.'):
 
 setup(
  name='pocsuite3',
- version='1.8.10',
+ version='1.8.11',
  url='https://pocsuite.org',
  description='Open-sourced remote vulnerability testing framework.',
  long_description=long_description,