From bbc6a4f16c739f1d22dd9dcea87612c4e4cfcc1f Mon Sep 17 00:00:00 2001
From: Benedek Racz <betontalpfa@gmail.com>
Date: Sat, 22 Feb 2020 17:05:01 +0100
Subject: [PATCH] [FIX] codepage in new console launch

---
 .gitignore              | 2 ++
 appveyor.yml            | 9 ++++++---
 wexpect/__main__.py     | 1 +
 wexpect/host.py         | 2 +-
 wexpect/wexpect_util.py | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index d457928..80ce5d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 __pycache__/
 *.py[cod]
 
+*coverage.xml
+
 # C extensions
 *.so
 
diff --git a/appveyor.yml b/appveyor.yml
index ac92281..a082ac6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,9 +12,12 @@ environment:
     secure: CcyBI8e/2LdIT2aYIytTAgR4795DNBDM/ztsz1kqZYYOeNc3zlJWLdYWrnjCHn5W6/ZcAHrsxCdCMHvtr6PIVgBRpl2RR3fk2jKTzKqJJsLW871q30BsE0kws32f1IiqfjVtLn8BUC91IJ2xBBXtOYktf1tCMi3zJMSF9+MIOQKIu298bIRnD1Lc+4lzcSZJOn4I7dOMdzlcCMRqhtO58TGwR/hD+22FHjyWVB8nLL18AO+XXS9lHSOUrH6rD5NYvVFZD68oV/RrCGAjRmfMnw==
   # Set default pytohn, the real matrinx is in the tox settings.
   matrix:
-    - PYTHON: "C:\\Python36"
-      PYTHON_VERSION: 3.6
-      PYTHON_ARCH: 32
+  - TOXENV: py37-default
+    PYTHON: "C:\\Python37"
+  - TOXENV: py37-legacy_wexpect
+    PYTHON: "C:\\Python37"
+  - TOXENV: py37-spawn_pipe
+    PYTHON: "C:\\Python37"
 
 build: off
 
diff --git a/wexpect/__main__.py b/wexpect/__main__.py
index 8dd6ca1..cb129d2 100644
--- a/wexpect/__main__.py
+++ b/wexpect/__main__.py
@@ -36,6 +36,7 @@ def main():
     parser.add_argument('--local_echo', type=str, help='Echo sent characters', default=True)
     parser.add_argument('--interact', type=str, help='Show console window', default=False)
     args = parser.parse_args()
+    logger.info(f'Starter arguments: {args}')
 
     if args.console_reader_class == 'ConsoleReaderSocket':
         conole_reader_class = console_reader.ConsoleReaderSocket
diff --git a/wexpect/host.py b/wexpect/host.py
index ce45856..83f8259 100644
--- a/wexpect/host.py
+++ b/wexpect/host.py
@@ -372,7 +372,7 @@ class SpawnBase:
             }
         )
         console_class_parameters_kv_pairs = [
-            f'--{k}={v}' for k, v in self.console_class_parameters.items()
+            f'--{k}={v}'for k, v in self.console_class_parameters.items() if v is not None 
         ]
         console_class_parameters_str = ' '.join(console_class_parameters_kv_pairs)
         args_str = join_args(args)
diff --git a/wexpect/wexpect_util.py b/wexpect/wexpect_util.py
index d48c552..366c0af 100644
--- a/wexpect/wexpect_util.py
+++ b/wexpect/wexpect_util.py
@@ -76,7 +76,7 @@ def init_logger(logger):
         logger.setLevel(logger_level)
         logger_filename = f'{logger_filename}.log'
         os.makedirs(os.path.dirname(logger_filename), exist_ok=True)
-        fh = logging.FileHandler(logger_filename, 'w', 'utf-8')
+        fh = logging.FileHandler(logger_filename, 'a', 'utf-8')
         formatter = logging.Formatter(
             '%(asctime)s - %(filename)s:%(lineno)d - %(levelname)s - %(message)s')
         fh.setFormatter(formatter)