From 09a965ab42ed5fed84c7122da81982612e81bbae Mon Sep 17 00:00:00 2001
From: Leon van der Ree <leon@synplyworks.com>
Date: Thu, 6 Jul 2023 20:38:52 +0200
Subject: [PATCH] included suggestions

---
 CHANGELOG.rst      | 2 +-
 environ/environ.py | 8 ++++----
 tests/test_env.py  | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d610e9ba..aa7b3ff8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -15,7 +15,7 @@ Added
   `#463 <https://github.com/joke2k/django-environ/pull/463>`_.
 - Added variable expansion
   `#468 <https://github.com/joke2k/django-environ/pull/468>`_.
-- Added capability to handle comments after #, after quoted values, like `KEY= 'part1 # part2' # comment`
+- Added capability to handle comments after #, after quoted values, like ``KEY= 'part1 # part2' # comment``
   `#475 <https://github.com/joke2k/django-environ/pull/475>`_.
 
 Changed
diff --git a/environ/environ.py b/environ/environ.py
index ae77de49..644286e1 100644
--- a/environ/environ.py
+++ b/environ/environ.py
@@ -970,14 +970,14 @@ def _keep_escaped_format_characters(match):
             m1 = re.match(r'\A(?:export )?([A-Za-z_0-9]+)=(.*)\Z', line)
             if m1:
                 key, val = m1.group(1), m1.group(2)
-                # search for value within quotes,
-                # ignore comments after # (outside quotes)
+                # Look for value in quotes, ignore post-# comments
+                # (outside quotes)
                 m2 = re.match(r"\A\s*'(?<!\\)(.*)'\s*(#.*\s*)?\Z", val)
                 if m2:
                     val = m2.group(1)
                 else:
-                    # if no quotes, search for value,
-                    # ignore comments after first #
+                    # For no quotes, find value, ignore comments
+                    # after the first #
                     m2a = re.match(r"\A(.*?)(#.*\s*)?\Z", val)
                     if m2a:
                         val = m2a.group(1)
diff --git a/tests/test_env.py b/tests/test_env.py
index ef09e1be..0b105f55 100644
--- a/tests/test_env.py
+++ b/tests/test_env.py
@@ -181,9 +181,6 @@ def test_str_list_with_spaces(self):
                               self.env('STR_LIST_WITH_SPACES', cast=[str]))
         assert_type_and_value(list, [' foo', '  spaces'],
                               self.env.list('STR_LIST_WITH_SPACES'))
-        # assert_type_and_value(list, [' foo', '  quoted'],
-        #                       self.env.list('STR_LIST_WITH_SPACES_QUOTED')
-        #                       ) # TODO: fix this
 
     def test_empty_list(self):
         assert_type_and_value(list, [], self.env('EMPTY_LIST', cast=[int]))