From c457e426fe96f2c0ac933c3df5f221e3593574e2 Mon Sep 17 00:00:00 2001
From: MinekPo1 <68391527+MinekPo1@users.noreply.github.com>
Date: Sun, 6 Mar 2022 12:30:37 +0100
Subject: [PATCH 1/2] Fix test. Oops!

---
 test/test_autopep8.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/test_autopep8.py b/test/test_autopep8.py
index 1a6947b7..40b65465 100755
--- a/test/test_autopep8.py
+++ b/test/test_autopep8.py
@@ -5836,6 +5836,7 @@ def test_parallel_jobs_with_diff_option(self):
                           ['--jobs=3', '--diff'], stdout=PIPE)
                 p.wait()
                 output = p.stdout.read().decode()
+                output = output.replace("\r\n","\n")  # windows compatibility
                 p.stdout.close()
 
                 actual_diffs = []
@@ -5844,9 +5845,9 @@ def test_parallel_jobs_with_diff_option(self):
 --- original/{filename}
 +++ fixed/{filename}
 @@ -1 +1 @@
--'abc'
+-'abc'  {blank}
 +'abc'
-""".format(filename=filename))
+""".format(filename=filename, blank=""))  # in case the users IDE trims leaning whitespace
                 self.assertEqual(p.returncode, autopep8.EXIT_CODE_OK)
                 for actual_diff in actual_diffs:
                     self.assertIn(actual_diff, output)

From 23944ffc2bc7119852d9e8556e3d5e561a0891f6 Mon Sep 17 00:00:00 2001
From: MinekPo1 <68391527+MinekPo1@users.noreply.github.com>
Date: Sun, 6 Mar 2022 12:31:22 +0100
Subject: [PATCH 2/2] remove vscode settings I accidentaly pushed

---
 .vscode/settings.json | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index b7f268b2..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"python.linting.enabled": false,
-	"python.testing.unittestArgs": [
-		"-v",
-		"-s",
-		"./test",
-		"-p",
-		"test_*.py"
-	],
-	"python.testing.pytestEnabled": false,
-	"python.testing.unittestEnabled": true
-}