Skip to content

Fix error due to imported module name clash #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olehermanse merged 1 commit into from
Aug 5, 2025
Merged

Fix error due to imported module name clash #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cfbs/cfbs_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from collections import OrderedDict
from typing import List

from cfbs.types import CFBSCommandGitResult
from cfbs.cfbs_types import CFBSCommandGitResult
from cfbs.utils import (
CFBSExitError,
CFBSUserError,
Expand Down
0 cfbs/types.py → cfbs/cfbs_types.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cfbs/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def search_command(terms: List[str]):
from cfbs.args import get_args

from cfbs.cfbs_json import CFBSJson
from cfbs.types import CFBSCommandExitCode, CFBSCommandGitResult
from cfbs.cfbs_types import CFBSCommandExitCode, CFBSCommandGitResult
from cfbs.updates import ModuleUpdates, update_module
from cfbs.utils import (
CFBSNetworkError,
Expand Down
2 changes: 1 addition & 1 deletion cfbs/git_magic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
git_check_tracked_changes,
)
from cfbs.args import get_args
from cfbs.types import CFBSCommandExitCode, CFBSCommandGitResult
from cfbs.cfbs_types import CFBSCommandExitCode, CFBSCommandGitResult
import logging as log
from functools import partial

Expand Down