aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: name conflict

Browse source
This commit is contained in:
Vlad Stan 2023-01-11 11:23:13 +02:00
parent 795d05c109
commit 2edb9da387
7 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lnbits/app.py
View file

@ -26,7 +26,7 @@ from .commands import migrate_databases
from .core import core_app, core_app_extra from .core import core_app, core_app_extra
from .core.services import check_admin_settings from .core.services import check_admin_settings
from .core.views.generic import core_html_routes from .core.views.generic import core_html_routes
from .extensions import Extension, InstalledExtensionMiddleware, get_valid_extensions from .extension_manger import Extension, InstalledExtensionMiddleware, get_valid_extensions
from .helpers import ( from .helpers import (
get_css_vendored, get_css_vendored,
get_js_vendored, get_js_vendored,

2
lnbits/commands.py
View file

@ -14,7 +14,7 @@ from .core import migrations as core_migrations
from .core.crud import USER_ID_ALL, get_dbversions, get_inactive_extensions from .core.crud import USER_ID_ALL, get_dbversions, get_inactive_extensions
from .core.helpers import migrate_extension_database, run_migration from .core.helpers import migrate_extension_database, run_migration
from .db import COCKROACH, POSTGRES, SQLITE from .db import COCKROACH, POSTGRES, SQLITE
from .extensions import get_valid_extensions from .extension_manger import get_valid_extensions
from .helpers import get_css_vendored, get_js_vendored, url_for_vendored from .helpers import get_css_vendored, get_js_vendored, url_for_vendored

2
lnbits/core/helpers.py
View file

@ -3,7 +3,7 @@ import re
from loguru import logger from loguru import logger
from lnbits.extensions import Extension from lnbits.extension_manger import Extension
from . import db as core_db from . import db as core_db
from .crud import update_migration_version from .crud import update_migration_version

2
lnbits/core/views/api.py
View file

@ -44,7 +44,7 @@ from lnbits.decorators import (
require_admin_key, require_admin_key,
require_invoice_key, require_invoice_key,
) )
from lnbits.extensions import Extension, InstallableExtension, get_valid_extensions from lnbits.extension_manger import Extension, InstallableExtension, get_valid_extensions
from lnbits.helpers import url_for from lnbits.helpers import url_for
from lnbits.settings import get_wallet_class, settings from lnbits.settings import get_wallet_class, settings
from lnbits.utils.exchange_rates import ( from lnbits.utils.exchange_rates import (

2
lnbits/core/views/generic.py
View file

@ -16,7 +16,7 @@ from lnbits.decorators import check_admin, check_user_exists
from lnbits.helpers import template_renderer, url_for from lnbits.helpers import template_renderer, url_for
from lnbits.settings import get_wallet_class, settings from lnbits.settings import get_wallet_class, settings
from ...extensions import InstallableExtension, get_valid_extensions from ...extension_manger import InstallableExtension, get_valid_extensions
from ..crud import ( from ..crud import (
USER_ID_ALL, USER_ID_ALL,
create_account, create_account,

0
lnbits/extensions.py → lnbits/extension_manger.py
View file

2
lnbits/helpers.py
View file

@ -9,7 +9,7 @@ from lnbits.jinja2_templating import Jinja2Templates
from lnbits.requestvars import g from lnbits.requestvars import g
from lnbits.settings import settings from lnbits.settings import settings
from .extensions import get_valid_extensions from .extension_manger import get_valid_extensions
def urlsafe_short_hash() -> str: def urlsafe_short_hash() -> str:
return shortuuid.uuid() return shortuuid.uuid()