Skip to content

Commit

Permalink
Fix URLs that were redirecting to another license
Browse files Browse the repository at this point in the history
All the opensource.org BSD license URLs at the top of source code
files in this project had originally pointed to a page on the
3-clause BSD license that this project used and continues to use.

But over time the site was apparently reorganized and the link
became a redirect to the page about the 2-clause BSD license.
Because it is identified only as the "BSD license" in the comments
in this project that contain the links, this unfortunately makes it
so those top-of-file comments all wrongly claim that the project is
2-clause BSD licensed.

This fixes the links by replacing them with the current URL of the
opensource.org page on the 3-clause BSD license. The current URL
contains "bsd-3-clause" in it, so this specific problem is unlikely
to recur with that URL (and even if it did, the text "bsd-3-clause
is information that may clue readers in to what is going on).
  • Loading branch information
EliahKagan committed Sep 17, 2023
1 parent e8c3085 commit ae8c018
Show file tree
Hide file tree
Showing 41 changed files with 43 additions and 44 deletions.
2 changes: 1 addition & 1 deletion git/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
# flake8: noqa
# @PydevCodeAnalysisIgnore
from git.exc import * # @NoMove @IgnorePep8
Expand Down
2 changes: 1 addition & 1 deletion git/cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
from __future__ import annotations
import re
import contextlib
Expand Down
2 changes: 1 addition & 1 deletion git/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
"""utilities to help provide compatibility with python 3"""
# flake8: noqa

Expand Down
2 changes: 1 addition & 1 deletion git/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
"""Module containing module parser implementation able to properly read and write
configuration files"""

Expand Down
2 changes: 1 addition & 1 deletion git/diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

import re
from git.cmd import handle_process_output
Expand Down
2 changes: 1 addition & 1 deletion git/exc.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
""" Module containing all exceptions thrown throughout the git package, """

from gitdb.exc import BadName # NOQA @UnusedWildImport skipcq: PYL-W0401, PYL-W0614
Expand Down
2 changes: 1 addition & 1 deletion git/index/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from contextlib import ExitStack
import datetime
Expand Down
2 changes: 1 addition & 1 deletion git/objects/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from git.exc import WorkTreeRepositoryUnsupported
from git.util import LazyMixin, join_path_native, stream_copy, bin_to_hex
Expand Down
2 changes: 1 addition & 1 deletion git/objects/blob.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
from mimetypes import guess_type
from . import base

Expand Down
2 changes: 1 addition & 1 deletion git/objects/commit.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
import datetime
import re
from subprocess import Popen, PIPE
Expand Down
2 changes: 1 addition & 1 deletion git/objects/tag.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
""" Module containing all object based types. """
from . import base
from .util import get_object_type_by_name, parse_actor_and_date
Expand Down
2 changes: 1 addition & 1 deletion git/objects/tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from git.util import IterableList, join_path
import git.diff as git_diff
Expand Down
2 changes: 1 addition & 1 deletion git/objects/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
"""Module for general utility functions"""
# flake8: noqa F401

Expand Down
2 changes: 1 addition & 1 deletion git/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

# Module implementing a remote object allowing easy access to git remotes
import logging
Expand Down
2 changes: 1 addition & 1 deletion git/repo/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
from __future__ import annotations
import logging
import os
Expand Down
2 changes: 1 addition & 1 deletion git/types.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
# flake8: noqa

import os
Expand Down
2 changes: 1 addition & 1 deletion git/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from abc import abstractmethod
import os.path as osp
Expand Down
2 changes: 1 addition & 1 deletion test/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
2 changes: 1 addition & 1 deletion test/lib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

# flake8: noqa
import inspect
Expand Down
2 changes: 1 addition & 1 deletion test/lib/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
import contextlib
from functools import wraps
import gc
Expand Down
2 changes: 1 addition & 1 deletion test/performance/test_commit.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
from io import BytesIO
from time import time
import sys
Expand Down
2 changes: 1 addition & 1 deletion test/test_actor.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from test.lib import TestBase
from git import Actor
Expand Down
2 changes: 1 addition & 1 deletion test/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
import os
import sys
import tempfile
Expand Down
2 changes: 1 addition & 1 deletion test/test_blob.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from test.lib import TestBase
from git import Blob
Expand Down
2 changes: 1 addition & 1 deletion test/test_clone.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from pathlib import Path
import re
Expand Down
2 changes: 1 addition & 1 deletion test/test_commit.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
import copy
from datetime import datetime
from io import BytesIO
Expand Down
2 changes: 1 addition & 1 deletion test/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

import glob
import io
Expand Down
2 changes: 1 addition & 1 deletion test/test_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
from git.db import GitCmdObjectDB
from git.exc import BadObject
from test.lib import TestBase
Expand Down
5 changes: 2 additions & 3 deletions test/test_diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
import ddt
import shutil
import tempfile
Expand Down Expand Up @@ -414,7 +414,7 @@ def test_diff_interface(self):

@with_rw_directory
def test_rename_override(self, rw_dir):
"""Test disabling of diff rename detection"""
"""Test disabling of diff rename detection"""

# create and commit file_a.txt
repo = Repo.init(rw_dir)
Expand Down Expand Up @@ -480,4 +480,3 @@ def test_rename_override(self, rw_dir):
self.assertEqual(True, diff.renamed_file)
self.assertEqual('file_a.txt', diff.rename_from)
self.assertEqual('file_b.txt', diff.rename_to)

2 changes: 1 addition & 1 deletion test/test_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
import os
import sys

Expand Down
2 changes: 1 addition & 1 deletion test/test_exc.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2008, 2009, 2016 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/


import re
Expand Down
2 changes: 1 addition & 1 deletion test/test_git.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
import os
import shutil
import subprocess
Expand Down
4 changes: 2 additions & 2 deletions test/test_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from io import BytesIO
import os
Expand Down Expand Up @@ -953,4 +953,4 @@ def test_index_add_pathlike(self, rw_repo):
file = git_dir / "file.txt"
file.touch()

rw_repo.index.add(file)
rw_repo.index.add(file)
2 changes: 1 addition & 1 deletion test/test_installation.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

import ast
import os
Expand Down
2 changes: 1 addition & 1 deletion test/test_refs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from itertools import chain
from pathlib import Path
Expand Down
2 changes: 1 addition & 1 deletion test/test_remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

import random
import tempfile
Expand Down
2 changes: 1 addition & 1 deletion test/test_repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
import glob
import io
from io import BytesIO
Expand Down
2 changes: 1 addition & 1 deletion test/test_stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from test.lib import TestBase, fixture
from git import Stats
Expand Down
2 changes: 1 addition & 1 deletion test/test_submodule.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/
import contextlib
import os
import shutil
Expand Down
2 changes: 1 addition & 1 deletion test/test_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

from io import BytesIO
from unittest import skipIf
Expand Down
2 changes: 1 addition & 1 deletion test/test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# the BSD License: https://opensource.org/license/bsd-3-clause/

import os
import pickle
Expand Down

0 comments on commit ae8c018

Please sign in to comment.