Merge pull request #55 from source-foundry/fix-udiff

Author: chrissimpkins

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v2.0.0
+
+- Backward incompatible change in the default unified diff approach for large files (fixes #54)
+- Transition to the upstream cPython implementation of `difflib.unified_diff` for diff execution
+- Remove cPython `difflib` derivative that was distributed with this project
+- Eliminate dual license structure with removal of cPython license and transition to Apache License, v2.0 only
+
 ## v1.0.2
 
 - Bump cffi to 1.14.0

Makefile

@@ -1,7 +1,7 @@
 all: install
 
 black:
-	black --exclude="difflib.py" lib/fdiff/*.py lib/fdiff/thirdparty/*.py
+	black lib/fdiff/*.py
 
 clean:
 	- rm dist/*.whl dist/*.tar.gz dist/*.zip
@@ -24,7 +24,7 @@ install-user:
 test: test-lint test-type-check test-unit
 
 test-coverage:
-	coverage run --omit="lib/fdiff/thirdparty/fdifflib.py" --source fdiff -m py.test
+	coverage run --source fdiff -m py.test
 	coverage report -m
 #	coverage html
 

README.md

@@ -210,11 +210,9 @@ Unit test coverage is executed with the `coverage` tool.  See the Makefile `test
 
 ## Acknowledgments
 
-`fdiff` is built with the fantastic [fontTools free software library](https://github.com/fonttools/fonttools) and performs text diffs of binary font files using dumps of the TTX OpenType table data serialization format as defined in the fontTools library.  The implementation of unified text file diffs is based on a (slightly) modified version of the Python `difflib` standard library source.  The modifications address diff performance issues with the lengthy text output from TTX dumps of font OpenType data. 
+`fdiff` is built with the fantastic [fontTools free software library](https://github.com/fonttools/fonttools) and performs text diffs of binary font files using dumps of the TTX OpenType table data serialization format as defined in the fontTools library.
 
-## Licenses
-
-### fdiff
+## License
 
 Copyright 2019 Source Foundry Authors and Contributors
 
@@ -223,11 +221,3 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
 
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-### Third-Party Licenses
-
-#### CPython `difflib` library
-
-This project distributes a modified version of third party source code from the [Python programming language standard library](https://github.com/python/cpython).  The `difflib.py` v3.7.4 module is Copyright © 2001-2019 Python Software Foundation; All Rights Reserved. This source is modified and distributed in this project under the [PSF LICENSE AGREEMENT FOR PYTHON 3.7.4](https://github.com/source-foundry/fdiff/blob/master/lib/fdiff/thirdparty/PYTHON_LICENSE).  The module is renamed to `fdifflib.py` to distinguish it from the upstream source, and modifications made here are documented in comments at the head of the module.
-
-

lib/fdiff/__init__.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-version = __version__ = "1.0.2"
+version = __version__ = "2.0.0"

lib/fdiff/diff.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import asyncio
+from difflib import unified_diff
 import os
 from multiprocessing import Pool, cpu_count
 import shlex
@@ -14,7 +15,7 @@
     _get_filepath_from_url,
     create_async_get_request_session_and_run,
 )
-from fdiff.thirdparty.fdifflib import unified_diff
+
 from fdiff.utils import get_file_modtime
 
 
@@ -23,7 +24,6 @@
 #  Private functions
 #
 #
-# TODO: add docstrings for all private functions
 
 
 def _async_fetch_files(dirpath, urls):