Merge branch 'master' into distro-vs-distros

4 years ago · bc5bf4cc3d
parent 9dce5fe056 cc8f9a0169
commit bc5bf4cc3d
3 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Copyright 2019, David Wilson
+Copyright 2021, the Mitogen authors
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
--- a/docs/conf.py
+++ b/docs/conf.py
@ -7,7 +7,7 @@ import mitogen
 VERSION = '%s.%s.%s' % mitogen.__version__
 author = u'Network Genomics'
-copyright = u'2019, Network Genomics'
+copyright = u'2021, the Mitogen authors'
 exclude_patterns = ['_build', '.venv']
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinxcontrib.programoutput', 'domainrefs']
--- a/tests/module_finder_test.py
+++ b/tests/module_finder_test.py
@ -308,7 +308,6 @@ if sys.version_info > (2, 6):
        #   AttributeError: module 'html.parser' has no attribute
        #   'HTMLParseError'
        #
        import pkg_resources._vendor.six
        from django.utils.six.moves import html_parser as _html_parser
        _html_parser.HTMLParseError = Exception