Hello community, here is the log from the commit of package python-tld for openSUSE:Factory checked in at 2020-07-07 12:57:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tld (Old) and /work/SRC/openSUSE:Factory/.python-tld.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-tld" Tue Jul 7 12:57:49 2020 rev:16 rq:809926 version:0.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-tld/python-tld.changes 2020-05-19 14:48:49.352115095 +0200 +++ /work/SRC/openSUSE:Factory/.python-tld.new.3060/python-tld.changes 2020-07-07 12:58:00.805682628 +0200 @@ -1,0 +2,7 @@ +Thu May 21 11:35:30 UTC 2020 - Sebastian Wagner <[email protected]> + +- Update to version 0.12.2: + - Add mozilla license to dist. + - Fix MyPy issues. + +------------------------------------------------------------------- Old: ---- tld-0.12.1.tar.gz New: ---- tld-0.12.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tld.spec ++++++ --- /var/tmp/diff_new_pack.p6b92p/_old 2020-07-07 12:58:06.149699542 +0200 +++ /var/tmp/diff_new_pack.p6b92p/_new 2020-07-07 12:58:06.153699554 +0200 @@ -19,10 +19,10 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-tld -Version: 0.12.1 +Version: 0.12.2 Release: 0 Summary: URL top level domain (TLD) extraction module -License: MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-only +License: MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later Group: Development/Languages/Python URL: https://github.com/barseghyanartur/tld Source: https://files.pythonhosted.org/packages/source/t/tld/tld-%{version}.tar.gz @@ -73,7 +73,7 @@ %files %{python_files} %doc README.rst CHANGELOG.rst -%license LICENSE_GPL2.0.txt LICENSE_LGPL_2.1.txt +%license LICENSE_GPL2.0.txt LICENSE_LGPL_2.1.txt LICENSE_MPL_1.1.txt %python_alternative %{_bindir}/update-tld-names %{python_sitelib}/* ++++++ tld-0.12.1.tar.gz -> tld-0.12.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/CHANGELOG.rst new/tld-0.12.2/CHANGELOG.rst --- old/tld-0.12.1/CHANGELOG.rst 2020-04-26 00:02:55.000000000 +0200 +++ new/tld-0.12.2/CHANGELOG.rst 2020-05-20 22:25:45.000000000 +0200 @@ -15,10 +15,21 @@ 0.3.4 to 0.4). - All backwards incompatible changes are mentioned in this document. +0.12.2 +------ +2020-05-20 + +- Add mozilla license to dist. +- Fix MyPy issues. + 0.12.1 ------ 2020-04-25 +.. note:: + + In commemoration of `Armenian Genocide <https://en.wikipedia.org/wiki/Armenian_Genocide>`_. + - Correctly handling domain names ending with dot(s). 0.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/LICENSE_MPL_1.1.txt new/tld-0.12.2/LICENSE_MPL_1.1.txt --- old/tld-0.12.1/LICENSE_MPL_1.1.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/tld-0.12.2/LICENSE_MPL_1.1.txt 2020-03-17 23:59:11.000000000 +0100 @@ -0,0 +1,467 @@ + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the MPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + https://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + tld - Extract the top level domain (TLD) from the URL given. + Copyright (C) 2013-2020 Artur Barseghyan + + The Initial Developer of the Original Code is Artur Barseghyan, + copyright (C) 2013-2020. All Rights Reserved. + + Alternatively, the contents of this file may be used under the terms + of the GPL 2.0 license or LGPL 2.1 license, in which case the + provisions of the chosen License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the certain License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the correspondent License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the GPL 2.0/LGPL 2.1 License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/MANIFEST.in new/tld-0.12.2/MANIFEST.in --- old/tld-0.12.1/MANIFEST.in 2019-12-16 22:00:50.000000000 +0100 +++ new/tld-0.12.2/MANIFEST.in 2020-04-30 00:06:57.000000000 +0200 @@ -6,6 +6,7 @@ include CREDITS.rst include LICENSE_GPL2.0.txt include LICENSE_LGPL_2.1.txt +include LICENSE_MPL_1.1.txt graft docs/ graft src/tld/tests/res/ graft src_py27/tld/tests/res diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/PKG-INFO new/tld-0.12.2/PKG-INFO --- old/tld-0.12.1/PKG-INFO 2020-04-26 00:24:47.000000000 +0200 +++ new/tld-0.12.2/PKG-INFO 2020-05-20 22:53:22.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: tld -Version: 0.12.1 +Version: 0.12.2 Summary: Extract the top-level domain (TLD) from the URL given. Home-page: https://github.com/barseghyanartur/tld Author: Artur Barseghyan diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/docs/changelog.rst new/tld-0.12.2/docs/changelog.rst --- old/tld-0.12.1/docs/changelog.rst 2020-04-26 00:03:44.000000000 +0200 +++ new/tld-0.12.2/docs/changelog.rst 2020-05-20 22:40:14.000000000 +0200 @@ -15,10 +15,21 @@ 0.3.4 to 0.4). - All backwards incompatible changes are mentioned in this document. +0.12.2 +------ +2020-05-20 + +- Add mozilla license to dist. +- Fix MyPy issues. + 0.12.1 ------ 2020-04-25 +.. note:: + + In commemoration of `Armenian Genocide <https://en.wikipedia.org/wiki/Armenian_Genocide>`_. + - Correctly handling domain names ending with dot(s). 0.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/setup.py new/tld-0.12.2/setup.py --- old/tld-0.12.1/setup.py 2020-04-26 00:03:42.000000000 +0200 +++ new/tld-0.12.2/setup.py 2020-05-20 22:27:25.000000000 +0200 @@ -7,7 +7,7 @@ except: readme = '' -version = '0.12.1' +version = '0.12.2' py_where = './src' py_package_dir = 'src' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src/tld/__init__.py new/tld-0.12.2/src/tld/__init__.py --- old/tld-0.12.1/src/tld/__init__.py 2020-04-25 23:47:59.000000000 +0200 +++ new/tld-0.12.2/src/tld/__init__.py 2020-05-20 22:39:21.000000000 +0200 @@ -9,7 +9,7 @@ ) __title__ = 'tld' -__version__ = '0.12.1' +__version__ = '0.12.2' __author__ = 'Artur Barseghyan' __copyright__ = '2013-2020 Artur Barseghyan' __license__ = 'MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src/tld/base.py new/tld-0.12.2/src/tld/base.py --- old/tld-0.12.1/src/tld/base.py 2020-03-17 23:58:23.000000000 +0100 +++ new/tld-0.12.2/src/tld/base.py 2020-05-20 22:22:16.000000000 +0200 @@ -1,5 +1,6 @@ from codecs import open as codecs_open from urllib.request import urlopen +from typing import Optional from .exceptions import ( TldIOError, @@ -17,9 +18,9 @@ class BaseTLDSourceParser(metaclass=Registry): """Base TLD source parser.""" - uid: str = None - source_url: str = None - local_path: str = None + uid: Optional[str] = None + source_url: str + local_path: str @classmethod def validate(cls): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src/tld/registry.py new/tld-0.12.2/src/tld/registry.py --- old/tld-0.12.1/src/tld/registry.py 2020-03-17 23:58:23.000000000 +0100 +++ new/tld-0.12.2/src/tld/registry.py 2020-05-20 22:22:16.000000000 +0200 @@ -1,4 +1,4 @@ -from typing import Type, Dict +from typing import Dict __author__ = 'Artur Barseghyan' __copyright__ = '2013-2020 Artur Barseghyan' @@ -10,14 +10,14 @@ class Registry(type): - REGISTRY = {} + REGISTRY = {} # type: Dict[str, Registry] - def __new__(cls, name, bases, attrs): - new_cls = type.__new__(cls, name, bases, attrs) + def __new__(mcs, name, bases, attrs): + new_cls = type.__new__(mcs, name, bases, attrs) # Here the name of the class is used as key but it could be any class # parameter. if getattr(new_cls, '_uid', None): - cls.REGISTRY[new_cls._uid] = new_cls + mcs.REGISTRY[new_cls._uid] = new_cls return new_cls @property @@ -25,21 +25,21 @@ return getattr(cls, 'uid', cls.__name__) @classmethod - def reset(cls) -> None: - cls.REGISTRY = {} + def reset(mcs) -> None: + mcs.REGISTRY = {} @classmethod - def get(cls, key, default=None): - return cls.REGISTRY.get(key, default) + def get(mcs, key, default=None): + return mcs.REGISTRY.get(key, default) @classmethod - def items(cls): - return cls.REGISTRY.items() + def items(mcs): + return mcs.REGISTRY.items() # @classmethod - # def get_registry(cls) -> Dict[str, Type]: - # return dict(cls.REGISTRY) + # def get_registry(mcs) -> Dict[str, Type]: + # return dict(mcs.REGISTRY) # # @classmethod - # def pop(cls, uid) -> None: - # cls.REGISTRY.pop(uid) + # def pop(mcs, uid) -> None: + # mcs.REGISTRY.pop(uid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src/tld/res/effective_tld_names.dat.txt new/tld-0.12.2/src/tld/res/effective_tld_names.dat.txt --- old/tld-0.12.1/src/tld/res/effective_tld_names.dat.txt 2020-04-25 23:47:47.000000000 +0200 +++ new/tld-0.12.2/src/tld/res/effective_tld_names.dat.txt 2020-05-20 22:22:16.000000000 +0200 @@ -7092,7 +7092,7 @@ // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-04-02T18:20:31Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-05-06T16:23:34Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7241,7 +7241,7 @@ // android : 2014-08-07 Charleston Road Registry Inc. android -// anquan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// anquan : 2015-01-08 Beijing Qihu Keji Co., Ltd. anquan // anz : 2015-07-31 Australia and New Zealand Banking Group Limited @@ -9749,7 +9749,7 @@ // shopping : 2016-03-31 Binky Moon, LLC shopping -// shouji : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// shouji : 2015-01-08 Beijing Qihu Keji Co., Ltd. shouji // show : 2015-03-05 Binky Moon, LLC @@ -10313,7 +10313,7 @@ // xfinity : 2015-07-09 Comcast IP Holdings I, LLC xfinity -// xihuan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// xihuan : 2015-01-08 Beijing Qihu Keji Co., Ltd. xihuan // xin : 2014-12-11 Elegant Leader Limited @@ -10634,7 +10634,7 @@ // youtube : 2014-05-01 Charleston Road Registry Inc. youtube -// yun : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// yun : 2015-01-08 Beijing Qihu Keji Co., Ltd. yun // zappos : 2015-06-25 Amazon Registry Services, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src/tld/result.py new/tld-0.12.2/src/tld/result.py --- old/tld-0.12.1/src/tld/result.py 2020-03-17 23:58:23.000000000 +0100 +++ new/tld-0.12.2/src/tld/result.py 2020-05-20 22:22:16.000000000 +0200 @@ -1,4 +1,4 @@ -from typing import Dict +from typing import Any, Dict from urllib.parse import SplitResult __author__ = 'Artur Barseghyan' @@ -52,7 +52,7 @@ __repr__ = __str__ @property - def __dict__(self) -> Dict[str, str]: + def __dict__(self) -> Dict[str, Any]: # type: ignore """Mimic __dict__ functionality. :return: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src/tld/tests/test_core.py new/tld-0.12.2/src/tld/tests/test_core.py --- old/tld-0.12.1/src/tld/tests/test_core.py 2020-04-25 23:47:11.000000000 +0200 +++ new/tld-0.12.2/src/tld/tests/test_core.py 2020-05-20 22:22:16.000000000 +0200 @@ -9,7 +9,7 @@ from urllib.parse import urlsplit -from faker import Faker +from faker import Faker # type: ignore from .. import defaults from ..base import BaseTLDSourceParser diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src/tld/utils.py new/tld-0.12.2/src/tld/utils.py --- old/tld-0.12.1/src/tld/utils.py 2020-04-25 23:37:52.000000000 +0200 +++ new/tld-0.12.2/src/tld/utils.py 2020-05-20 22:22:16.000000000 +0200 @@ -5,7 +5,7 @@ # codecs_open = open from os.path import isabs import sys -from typing import Dict, Type, Union, Tuple, List +from typing import Dict, Type, Union, Tuple, List, Optional from urllib.parse import urlsplit, SplitResult from .base import BaseTLDSourceParser @@ -89,7 +89,7 @@ :param parser_uid: :return: """ - results = [] + results: List[bool] = [] results_append = results.append if parser_uid: parser_cls = Registry.get(parser_uid, None) @@ -176,7 +176,7 @@ cls, fail_silently: bool = False, retry_count: int = 0 - ) -> Union[Dict[str, Trie], None]: + ) -> Optional[Dict[str, Trie]]: """Parse. :param fail_silently: @@ -200,7 +200,6 @@ ): return _tld_names - local_file = None try: # Load the TLD names file if isabs(cls.local_path): @@ -397,7 +396,7 @@ search_private: bool = True, parser_class: Type[BaseTLDSourceParser] = MozillaTLDSourceParser, **kwargs -) -> Union[str, None]: +) -> Optional[str]: """Extract the first level domain. Extract the top level domain based on the mozilla's effective TLD names @@ -441,6 +440,9 @@ if domain_parts is None: return None + # This should be None when domain_parts is None + # but mypy isn't quite smart enough to figure that out yet + assert non_zero_i is not None if non_zero_i < 0: # hostname = tld return parsed_url.hostname @@ -456,7 +458,7 @@ search_public: bool = True, search_private: bool = True, parser_class: Type[BaseTLDSourceParser] = MozillaTLDSourceParser -) -> Union[None, str, Result]: +) -> Optional[Union[str, Result]]: """Extract the top level domain. Extract the top level domain based on the mozilla's effective TLD names @@ -497,6 +499,10 @@ if domain_parts is None: return None + # This should be None when domain_parts is None + # but mypy isn't quite smart enough to figure that out yet + assert non_zero_i is not None + if not as_object: if non_zero_i < 0: # hostname = tld @@ -507,6 +513,9 @@ # hostname = tld subdomain = "" domain = "" + # This is checked in process_url but the type is ambiguous (Optional[str]) + # so this assertion is just to satisfy mypy + assert parsed_url.hostname is not None, "No hostname in URL" _tld = parsed_url.hostname else: subdomain = ".".join(domain_parts[:non_zero_i-1]) @@ -539,7 +548,7 @@ :param search_public: :param search_private: :param parser_class: - :return: + :return: Tuple (tld, domain, subdomain) :rtype: tuple """ try: @@ -552,9 +561,10 @@ search_private=search_private, parser_class=parser_class ) - _tld = obj.tld - domain = obj.domain - subdomain = obj.subdomain + if obj is None: + return None, None, None + + return obj.tld, obj.domain, obj.subdomain # type: ignore except ( TldBadUrl, @@ -562,11 +572,9 @@ TldImproperlyConfigured, TldIOError ): - _tld = None - domain = None - subdomain = None + pass - return _tld, domain, subdomain + return None, None, None def is_tld( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src/tld.egg-info/PKG-INFO new/tld-0.12.2/src/tld.egg-info/PKG-INFO --- old/tld-0.12.1/src/tld.egg-info/PKG-INFO 2020-04-26 00:24:47.000000000 +0200 +++ new/tld-0.12.2/src/tld.egg-info/PKG-INFO 2020-05-20 22:53:21.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: tld -Version: 0.12.1 +Version: 0.12.2 Summary: Extract the top-level domain (TLD) from the URL given. Home-page: https://github.com/barseghyanartur/tld Author: Artur Barseghyan diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src/tld.egg-info/SOURCES.txt new/tld-0.12.2/src/tld.egg-info/SOURCES.txt --- old/tld-0.12.1/src/tld.egg-info/SOURCES.txt 2020-04-26 00:24:47.000000000 +0200 +++ new/tld-0.12.2/src/tld.egg-info/SOURCES.txt 2020-05-20 22:53:21.000000000 +0200 @@ -2,6 +2,7 @@ CREDITS.rst LICENSE_GPL2.0.txt LICENSE_LGPL_2.1.txt +LICENSE_MPL_1.1.txt MANIFEST.in README.rst setup.cfg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src_py27/tld/res/effective_tld_names.dat.txt new/tld-0.12.2/src_py27/tld/res/effective_tld_names.dat.txt --- old/tld-0.12.1/src_py27/tld/res/effective_tld_names.dat.txt 2020-04-26 00:23:56.000000000 +0200 +++ new/tld-0.12.2/src_py27/tld/res/effective_tld_names.dat.txt 2020-05-20 22:52:11.000000000 +0200 @@ -7092,7 +7092,7 @@ // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-04-02T18:20:31Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-05-06T16:23:34Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7241,7 +7241,7 @@ // android : 2014-08-07 Charleston Road Registry Inc. android -// anquan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// anquan : 2015-01-08 Beijing Qihu Keji Co., Ltd. anquan // anz : 2015-07-31 Australia and New Zealand Banking Group Limited @@ -9749,7 +9749,7 @@ // shopping : 2016-03-31 Binky Moon, LLC shopping -// shouji : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// shouji : 2015-01-08 Beijing Qihu Keji Co., Ltd. shouji // show : 2015-03-05 Binky Moon, LLC @@ -10313,7 +10313,7 @@ // xfinity : 2015-07-09 Comcast IP Holdings I, LLC xfinity -// xihuan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// xihuan : 2015-01-08 Beijing Qihu Keji Co., Ltd. xihuan // xin : 2014-12-11 Elegant Leader Limited @@ -10634,7 +10634,7 @@ // youtube : 2014-05-01 Charleston Road Registry Inc. youtube -// yun : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// yun : 2015-01-08 Beijing Qihu Keji Co., Ltd. yun // zappos : 2015-06-25 Amazon Registry Services, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tld-0.12.1/src_py35/tld/res/effective_tld_names.dat.txt new/tld-0.12.2/src_py35/tld/res/effective_tld_names.dat.txt --- old/tld-0.12.1/src_py35/tld/res/effective_tld_names.dat.txt 2020-04-26 00:24:07.000000000 +0200 +++ new/tld-0.12.2/src_py35/tld/res/effective_tld_names.dat.txt 2020-05-20 22:52:22.000000000 +0200 @@ -7092,7 +7092,7 @@ // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-04-02T18:20:31Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-05-06T16:23:34Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7241,7 +7241,7 @@ // android : 2014-08-07 Charleston Road Registry Inc. android -// anquan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// anquan : 2015-01-08 Beijing Qihu Keji Co., Ltd. anquan // anz : 2015-07-31 Australia and New Zealand Banking Group Limited @@ -9749,7 +9749,7 @@ // shopping : 2016-03-31 Binky Moon, LLC shopping -// shouji : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// shouji : 2015-01-08 Beijing Qihu Keji Co., Ltd. shouji // show : 2015-03-05 Binky Moon, LLC @@ -10313,7 +10313,7 @@ // xfinity : 2015-07-09 Comcast IP Holdings I, LLC xfinity -// xihuan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// xihuan : 2015-01-08 Beijing Qihu Keji Co., Ltd. xihuan // xin : 2014-12-11 Elegant Leader Limited @@ -10634,7 +10634,7 @@ // youtube : 2014-05-01 Charleston Road Registry Inc. youtube -// yun : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// yun : 2015-01-08 Beijing Qihu Keji Co., Ltd. yun // zappos : 2015-06-25 Amazon Registry Services, Inc.
