Don't turn " into " except in attribute values.

2 files changed, 9 insertions, 0 deletions

diff --git a/beautifulsoup/dammit.py b/beautifulsoup/dammit.py
index 67bec17..c2ba1fc 100644
--- a/beautifulsoup/dammit.py
+++ b/beautifulsoup/dammit.py
@@ -35,6 +35,11 @@ class EntitySubstitution(object):
         lookup = {}
         characters = []
         for codepoint, name in codepoint2name.items():
+            if codepoint == 34:
+                # There's no point in turning the quotation mark into
+                # " except in attribute values, which are handled
+                # separately.
+                continue;
             character = unichr(codepoint)
             characters.append(character)
             lookup[character] = name
diff --git a/tests/test_soup.py b/tests/test_soup.py
index eaedd94..5df49bc 100644
--- a/tests/test_soup.py
+++ b/tests/test_soup.py
@@ -80,6 +80,10 @@ class TestEntitySubstitution(unittest.TestCase):
             self.sub.substitute_xml("ÁT&T"),
             "ÁT&T")
 
+    def test_quotes_not_html_substituted(self):
+        """There's no need to do this except inside attribute values."""
+        text = 'Bob\'s "bar"'
+        self.assertEquals(self.sub.substitute_html(text), text)
 
 class TestUnicodeDammit(unittest.TestCase):
     """Standalone tests of Unicode, Dammit."""