From 74971441d1f86411e5e72d834dd6fa87a6994007 Mon Sep 17 00:00:00 2001
From: Leonard Richardson <leonardr@segfault.org>
Date: Mon, 24 Dec 2018 10:36:00 -0500
Subject: Clarified the software license.

---
 LICENSE                    | 5 ++++-
 NEWS.txt                   | 3 +++
 bs4/__init__.py            | 6 ++----
 bs4/builder/__init__.py    | 4 ++--
 bs4/builder/_html5lib.py   | 4 ++--
 bs4/builder/_htmlparser.py | 4 ++--
 bs4/builder/_lxml.py       | 5 +++--
 bs4/dammit.py              | 3 +--
 bs4/diagnose.py            | 3 +--
 bs4/element.py             | 3 +--
 bs4/testing.py             | 3 +--
 11 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/LICENSE b/LICENSE
index c500452..4c068ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Beautiful Soup is made available under the MIT license:
 
- Copyright (c) 2004-2018 Leonard Richardson
+ Copyright (c) 2004-2019 Leonard Richardson
 
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
@@ -25,3 +25,6 @@ Beautiful Soup is made available under the MIT license:
 Beautiful Soup incorporates code from the html5lib library, which is
 also made available under the MIT license. Copyright (c) 2006-2013
 James Graham and other contributors
+
+Beautiful Soup depends on the soupsieve library, which is also made
+available under the MIT license. Copyright (c) 2018 Isaac Muse
diff --git a/NEWS.txt b/NEWS.txt
index 4f5278a..71d405f 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -23,6 +23,9 @@
   elements) were not being treated as part of the tree. Patch by Isaac
   Muse. [bug=1798699]
 
+* Clarified ambiguous license statements in the source code. Beautiful
+  Soup is released under the MIT license, and has been for some time.
+
 = 4.6.3 (20180812)
 
 * Exactly the same as 4.6.2. Re-released to make the README file
diff --git a/bs4/__init__.py b/bs4/__init__.py
index ea9d9eb..db9ecf3 100644
--- a/bs4/__init__.py
+++ b/bs4/__init__.py
@@ -17,12 +17,10 @@ http://www.crummy.com/software/BeautifulSoup/bs4/doc/
 
 """
 
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
 __author__ = "Leonard Richardson (leonardr@segfault.org)"
-__version__ = "4.6.3"
+__version__ = "4.7.0"
 __copyright__ = "Copyright (c) 2004-2018 Leonard Richardson"
+# Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
 __all__ = ['BeautifulSoup']
diff --git a/bs4/builder/__init__.py b/bs4/builder/__init__.py
index 610d42f..46b28bd 100644
--- a/bs4/builder/__init__.py
+++ b/bs4/builder/__init__.py
@@ -1,5 +1,5 @@
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Use of this source code is governed by the MIT license.
+__license__ = "MIT"
 
 from collections import defaultdict
 import itertools
diff --git a/bs4/builder/_html5lib.py b/bs4/builder/_html5lib.py
index 388c3d6..2c929b9 100644
--- a/bs4/builder/_html5lib.py
+++ b/bs4/builder/_html5lib.py
@@ -1,5 +1,5 @@
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Use of this source code is governed by the MIT license.
+__license__ = "MIT"
 
 __all__ = [
     'HTML5TreeBuilder',
diff --git a/bs4/builder/_htmlparser.py b/bs4/builder/_htmlparser.py
index ee6c685..ff09ca3 100644
--- a/bs4/builder/_htmlparser.py
+++ b/bs4/builder/_htmlparser.py
@@ -1,8 +1,8 @@
 # encoding: utf-8
 """Use the HTMLParser library to parse HTML files that aren't too bad."""
 
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Use of this source code is governed by the MIT license.
+__license__ = "MIT"
 
 __all__ = [
     'HTMLParserTreeBuilder',
diff --git a/bs4/builder/_lxml.py b/bs4/builder/_lxml.py
index 7debf56..3a1700c 100644
--- a/bs4/builder/_lxml.py
+++ b/bs4/builder/_lxml.py
@@ -1,5 +1,6 @@
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Use of this source code is governed by the MIT license.
+__license__ = "MIT"
+
 __all__ = [
     'LXMLTreeBuilderForXML',
     'LXMLTreeBuilder',
diff --git a/bs4/dammit.py b/bs4/dammit.py
index be46b39..fb2f8b8 100644
--- a/bs4/dammit.py
+++ b/bs4/dammit.py
@@ -6,8 +6,7 @@ necessary. It is heavily based on code from Mark Pilgrim's Universal
 Feed Parser. It works best on XML and HTML, but it does not rewrite the
 XML or HTML to reflect a new encoding; that's the tree builder's job.
 """
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
 import codecs
diff --git a/bs4/diagnose.py b/bs4/diagnose.py
index 7a28c09..f9835c3 100644
--- a/bs4/diagnose.py
+++ b/bs4/diagnose.py
@@ -1,7 +1,6 @@
 """Diagnostic functions, mainly for use when doing tech support."""
 
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
 import cProfile
diff --git a/bs4/element.py b/bs4/element.py
index 97403c9..ba70b24 100644
--- a/bs4/element.py
+++ b/bs4/element.py
@@ -1,5 +1,4 @@
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
 try:
diff --git a/bs4/testing.py b/bs4/testing.py
index 745a9c4..13ff63f 100644
--- a/bs4/testing.py
+++ b/bs4/testing.py
@@ -1,8 +1,7 @@
 # encoding: utf-8
 """Helper classes for tests."""
 
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
 import pickle
-- 
cgit v1.2.1