From 5b1568d8bb479aeda3c590cb863c5e54cecf18fb Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Tue, 7 Jun 2022 08:58:07 +0200
Subject: [PATCH] [lint] #292: Rename license module to g1_monetary_license
To avoid following report:
W0622: Redefining built-in 'license' (redefined-builtin)
---
silkaj/cert.py | 2 +-
silkaj/cli.py | 2 +-
silkaj/{license.py => g1_monetary_license.py} | 1 +
silkaj/membership.py | 2 +-
...{test_license.py => test_g1_monetary_license.py} | 13 +++++++------
5 files changed, 11 insertions(+), 9 deletions(-)
rename silkaj/{license.py => g1_monetary_license.py} (99%)
rename tests/{test_license.py => test_g1_monetary_license.py} (90%)
diff --git a/silkaj/cert.py b/silkaj/cert.py
index d282cc4b..4aed20f9 100644
--- a/silkaj/cert.py
+++ b/silkaj/cert.py
@@ -30,7 +30,7 @@ from silkaj.auth import auth_method
from silkaj.blockchain_tools import get_blockchain_parameters, get_head_block
from silkaj.constants import ALL, DATE
from silkaj.crypto_tools import is_pubkey_and_check
-from silkaj.license import license_approval
+from silkaj.g1_monetary_license import license_approval
from silkaj.network_tools import client_instance, send_document
diff --git a/silkaj/cli.py b/silkaj/cli.py
index d8203875..9ec4bac6 100644
--- a/silkaj/cli.py
+++ b/silkaj/cli.py
@@ -29,7 +29,7 @@ from silkaj.constants import (
G1_TEST_DEFAULT_ENDPOINT,
SILKAJ_VERSION,
)
-from silkaj.license import license_command
+from silkaj.g1_monetary_license import license_command
from silkaj.membership import send_membership
from silkaj.money import cmd_amount
from silkaj.tx import send_transaction
diff --git a/silkaj/license.py b/silkaj/g1_monetary_license.py
similarity index 99%
rename from silkaj/license.py
rename to silkaj/g1_monetary_license.py
index 323e45cb..b89ce1e1 100644
--- a/silkaj/license.py
+++ b/silkaj/g1_monetary_license.py
@@ -16,6 +16,7 @@
from pathlib import Path
import click
+
import g1_monetary_license as gml
diff --git a/silkaj/membership.py b/silkaj/membership.py
index 137f1d68..a26e20a8 100644
--- a/silkaj/membership.py
+++ b/silkaj/membership.py
@@ -26,7 +26,7 @@ from tabulate import tabulate
from silkaj import auth, tui, wot
from silkaj.blockchain_tools import get_blockchain_parameters, get_head_block
from silkaj.constants import DATE, SUCCESS_EXIT_STATUS
-from silkaj.license import license_approval
+from silkaj.g1_monetary_license import license_approval
from silkaj.network_tools import client_instance, send_document
diff --git a/tests/test_license.py b/tests/test_g1_monetary_license.py
similarity index 90%
rename from tests/test_license.py
rename to tests/test_g1_monetary_license.py
index e7637e8c..33ebf57a 100644
--- a/tests/test_license.py
+++ b/tests/test_g1_monetary_license.py
@@ -18,12 +18,13 @@ from unittest.mock import patch
import pytest
from click.testing import CliRunner
-from silkaj import cli, license
+from silkaj import cli
+from silkaj import g1_monetary_license as gml
from silkaj.constants import SUCCESS_EXIT_STATUS
def test_license_approval_g1_test(capsys):
- license.license_approval("g1-test")
+ gml.license_approval("g1-test")
assert not capsys.readouterr().out
@@ -38,11 +39,11 @@ def test_license_approval_g1_test(capsys):
],
)
@patch("click.confirm")
-@patch.object(license.G1MonetaryLicense, "display_license")
+@patch.object(gml.G1MonetaryLicense, "display_license")
def test_license_approval_g1(mock_display_license, mock_confirm, display, approve):
# https://stackoverflow.com/a/62939130
mock_confirm.return_value = display
- license.license_approval("g1")
+ gml.license_approval("g1")
if display:
mock_display_license.assert_called_once()
mock_confirm.assert_called()
@@ -65,7 +66,7 @@ def test_language_prompt(language, license_sample):
def test_available_languages_and_get_license_path():
- g1ml = license.G1MonetaryLicense()
+ g1ml = gml.G1MonetaryLicense()
for language_code in g1ml.languages_codes:
assert g1ml.get_license_path(language_code).is_file()
@@ -73,7 +74,7 @@ def test_available_languages_and_get_license_path():
def test_long_language_code_handling():
language_code = "fr-FR"
content = "Licence monétaire Ğ1"
- g1ml = license.G1MonetaryLicense()
+ g1ml = gml.G1MonetaryLicense()
license_path = g1ml.get_license_path(language_code)
runner = CliRunner()
with runner.isolated_filesystem():
--
GitLab