From 806365dc18fa5404d72f3c1d71dce70501bab521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20Marussy?= Date: Mon, 25 Jan 2021 01:34:03 +0100 Subject: Make Pyright happy by importing load_doc directly --- .../plugins/closing_balance_test.py | 10 ++--- .../plugins/default_tolerance_test.py | 12 +++--- .../plugins/selective_implicit_prices_test.py | 18 ++++----- beancount_extras_kris7t/plugins/templates_test.py | 35 ++++++++-------- .../plugins/transfer_accounts_test.py | 46 +++++++++++----------- 5 files changed, 61 insertions(+), 60 deletions(-) (limited to 'beancount_extras_kris7t/plugins') diff --git a/beancount_extras_kris7t/plugins/closing_balance_test.py b/beancount_extras_kris7t/plugins/closing_balance_test.py index 40115bf..eab377c 100644 --- a/beancount_extras_kris7t/plugins/closing_balance_test.py +++ b/beancount_extras_kris7t/plugins/closing_balance_test.py @@ -3,13 +3,13 @@ __license__ = 'GNU GPLv2' import unittest -from beancount import loader +from beancount.loader import load_doc from beancount.parser import cmptest class TestClosingBalance(cmptest.TestCase): - @loader.load_doc() + @load_doc() def test_close_account_correct(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.closing_balance" @@ -47,7 +47,7 @@ class TestClosingBalance(cmptest.TestCase): 2020-03-15 close Assets:Checking ''', entries) - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_close_account_incorrect(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.closing_balance" @@ -86,7 +86,7 @@ class TestClosingBalance(cmptest.TestCase): ''', entries) self.assertRegex(errors[0].message, '^Balance failed for \'Assets:Checking\'') - @loader.load_doc() + @load_doc() def test_close_account_zero(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.closing_balance" @@ -107,7 +107,7 @@ class TestClosingBalance(cmptest.TestCase): 2020-03-15 close Assets:Checking ''', entries) - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_invalid_close_to(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.closing_balance" diff --git a/beancount_extras_kris7t/plugins/default_tolerance_test.py b/beancount_extras_kris7t/plugins/default_tolerance_test.py index 2e5c629..4ef84c1 100644 --- a/beancount_extras_kris7t/plugins/default_tolerance_test.py +++ b/beancount_extras_kris7t/plugins/default_tolerance_test.py @@ -3,13 +3,13 @@ __license__ = 'GNU GPLv2' import unittest -from beancount import loader +from beancount.loader import load_doc from beancount.parser import cmptest class DefaultToleranceTest(cmptest.TestCase): - @loader.load_doc() + @load_doc() def test_account_with_tolerance(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.default_tolerance" @@ -28,7 +28,7 @@ class DefaultToleranceTest(cmptest.TestCase): 2020-01-01 balance Assets:Checking 0 ~ 10 USD ''', entries) - @loader.load_doc() + @load_doc() def test_account_with_tolerance_override(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.default_tolerance" @@ -47,7 +47,7 @@ class DefaultToleranceTest(cmptest.TestCase): 2020-01-01 balance Assets:Checking 10 ~ 20 USD ''', entries) - @loader.load_doc() + @load_doc() def test_account_with_tolerance_override_zero(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.default_tolerance" @@ -66,7 +66,7 @@ class DefaultToleranceTest(cmptest.TestCase): 2020-01-01 balance Assets:Checking 0 ~ 0 USD ''', entries) - @loader.load_doc() + @load_doc() def test_account_without_tolerance(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.default_tolerance" @@ -87,7 +87,7 @@ class DefaultToleranceTest(cmptest.TestCase): 2020-01-02 balance Assets:Checking 10 ~ 20 USD ''', entries) - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_account_with_invalid_tolerance(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.default_tolerance" diff --git a/beancount_extras_kris7t/plugins/selective_implicit_prices_test.py b/beancount_extras_kris7t/plugins/selective_implicit_prices_test.py index 6ead45d..b4a9d8e 100644 --- a/beancount_extras_kris7t/plugins/selective_implicit_prices_test.py +++ b/beancount_extras_kris7t/plugins/selective_implicit_prices_test.py @@ -6,15 +6,15 @@ import unittest from beancount.core.number import D from beancount.core import data +from beancount.loader import load_doc from beancount.parser import cmptest -from beancount import loader from beancount_extras_kris7t.plugins import selective_implicit_prices as implicit_prices class TestImplicitPrices(cmptest.TestCase): - @loader.load_doc() + @load_doc() def test_add_implicit_prices__all_cases(self, entries, _, options_map): """ 1702-04-02 commodity USD @@ -124,7 +124,7 @@ class TestImplicitPrices(cmptest.TestCase): actual = (price.currency, price.amount.currency, price.amount.number) self.assertEqual(expected, actual) - @loader.load_doc() + @load_doc() def test_add_implicit_prices__other_account(self, entries, errors, options_map): """ 2013-01-01 commodity HOOL @@ -185,7 +185,7 @@ class TestImplicitPrices(cmptest.TestCase): """, new_entries) - @loader.load_doc() + @load_doc() def test_add_implicit_prices__duplicates_on_same_transaction(self, entries, _, options_map): """ @@ -234,7 +234,7 @@ class TestImplicitPrices(cmptest.TestCase): """, new_entries) - @loader.load_doc() + @load_doc() def test_add_implicit_prices__duplicates_on_different_transactions(self, entries, _, options_map): @@ -296,7 +296,7 @@ class TestImplicitPrices(cmptest.TestCase): """, new_entries) - @loader.load_doc() + @load_doc() def test_add_implicit_prices__duplicates_overloaded(self, entries, _, options_map): """ 2013-01-01 commodity HOOL @@ -343,7 +343,7 @@ class TestImplicitPrices(cmptest.TestCase): """, new_entries) - @loader.load_doc() + @load_doc() def test_add_implicit_prices__not_enabled(self, entries, errors, options_map): """ 2013-01-01 open Assets:Account1 @@ -363,7 +363,7 @@ class TestImplicitPrices(cmptest.TestCase): Assets:Other -780000 USD """, new_entries) - @loader.load_doc() + @load_doc() def test_add_implicit_prices__disabled(self, entries, errors, options_map): """ 2013-01-01 commodity HOOL @@ -389,7 +389,7 @@ class TestImplicitPrices(cmptest.TestCase): Assets:Other -780000 USD """, new_entries) - @loader.load_doc() + @load_doc() def test_add_implicit_prices__invalid(self, entries, errors, options_map): """ 2013-01-01 commodity HOOL diff --git a/beancount_extras_kris7t/plugins/templates_test.py b/beancount_extras_kris7t/plugins/templates_test.py index 5f63e6c..a786ccf 100644 --- a/beancount_extras_kris7t/plugins/templates_test.py +++ b/beancount_extras_kris7t/plugins/templates_test.py @@ -3,14 +3,15 @@ __license__ = 'GNU GPLv2' import unittest -from beancount import loader +from beancount.loader import load_doc from beancount.parser import cmptest + import pytest class TestClosingBalance(cmptest.TestCase): - @loader.load_doc() + @load_doc() def test_use_template_simple(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -44,7 +45,7 @@ class TestClosingBalance(cmptest.TestCase): Expenses:Food -25 USD ''', entries) - @loader.load_doc() + @load_doc() def test_use_template_metadata(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -78,7 +79,7 @@ class TestClosingBalance(cmptest.TestCase): Expenses:Food -25 USD ''', entries) - @loader.load_doc() + @load_doc() def test_use_template_scaled(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -112,7 +113,7 @@ class TestClosingBalance(cmptest.TestCase): Expenses:Food -27 USD ''', entries) - @loader.load_doc() + @load_doc() def test_use_template_overwritten(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -155,7 +156,7 @@ class TestClosingBalance(cmptest.TestCase): Expenses:Tax -2.70 USD ''', entries) - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_invalid_name(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -171,7 +172,7 @@ class TestClosingBalance(cmptest.TestCase): self.assertRegex(errors[0].message, "^template must be a string") @pytest.mark.xfail(reason="Empty custom directive fails in beancount.ops.pad") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_use_missing_name(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -188,7 +189,7 @@ class TestClosingBalance(cmptest.TestCase): ''' self.assertRegex(errors[0].message, "^Template name missing") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_use_too_many_arguments(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -205,7 +206,7 @@ class TestClosingBalance(cmptest.TestCase): ''' self.assertRegex(errors[0].message, "^Too many template-use arguments") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_use_invalid_name(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -214,7 +215,7 @@ class TestClosingBalance(cmptest.TestCase): ''' self.assertRegex(errors[0].message, "^Template name must be a string") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_use_unknown(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -223,7 +224,7 @@ class TestClosingBalance(cmptest.TestCase): ''' self.assertRegex(errors[0].message, "^Unknown template") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_use_invalid_scale_factor(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -240,7 +241,7 @@ class TestClosingBalance(cmptest.TestCase): ''' self.assertRegex(errors[0].message, "^Invalid scale factor") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_use_zero_scale_factor(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -257,7 +258,7 @@ class TestClosingBalance(cmptest.TestCase): ''' self.assertRegex(errors[0].message, "^Scale factor must not be 0") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_template_delete(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -277,7 +278,7 @@ class TestClosingBalance(cmptest.TestCase): self.assertRegex(errors[0].message, "^Unknown template") @pytest.mark.xfail(reason="Empty custom directive fails in beancount.ops.pad") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_template_delete_too_few_arguments(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -286,7 +287,7 @@ class TestClosingBalance(cmptest.TestCase): ''' self.assertRegex(errors[0].message, "^template-delete takes a single argument") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_template_delete_too_many_arguments(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -303,7 +304,7 @@ class TestClosingBalance(cmptest.TestCase): ''' self.assertRegex(errors[0].message, "^template-delete takes a single argument") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_template_delete_invalid_argument(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" @@ -312,7 +313,7 @@ class TestClosingBalance(cmptest.TestCase): ''' self.assertRegex(errors[0].message, "^Template name must be a string") - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_template_delete_unknown(self, entries, errors, options_map): ''' plugin "beancount_extras_kris7t.plugins.templates" diff --git a/beancount_extras_kris7t/plugins/transfer_accounts_test.py b/beancount_extras_kris7t/plugins/transfer_accounts_test.py index 0883522..a80b70c 100644 --- a/beancount_extras_kris7t/plugins/transfer_accounts_test.py +++ b/beancount_extras_kris7t/plugins/transfer_accounts_test.py @@ -3,13 +3,13 @@ __license__ = 'GNU GPLv2' import unittest -from beancount import loader +from beancount.loader import load_doc from beancount.parser import cmptest class TestTransferAccounts(cmptest.TestCase): - @loader.load_doc() + @load_doc() def test_same_currency(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -40,7 +40,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -20 USD ''', entries) - @loader.load_doc() + @load_doc() def test_missing_date(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -70,7 +70,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -20 USD ''', entries) - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_missing_account_with_date(self, _, errors, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -86,7 +86,7 @@ class TestTransferAccounts(cmptest.TestCase): ''' self.assertRegex(errors[0].message, 'transfer-date was set but transfer-account was not') - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_missing_account_with_conversion(self, _, errors, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -103,7 +103,7 @@ class TestTransferAccounts(cmptest.TestCase): self.assertRegex( errors[0].message, 'transfer-converted was set but transfer-account was not') - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_invalid_account(self, _, errors, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -119,7 +119,7 @@ class TestTransferAccounts(cmptest.TestCase): ''' self.assertRegex(errors[0].message, 'transfer-account must be a string.*') - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_invalid_date(self, _, errors, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -136,7 +136,7 @@ class TestTransferAccounts(cmptest.TestCase): ''' self.assertRegex(errors[0].message, 'transfer-date must be a date.*') - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_invalid_conversion(self, _, errors, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -153,7 +153,7 @@ class TestTransferAccounts(cmptest.TestCase): ''' self.assertRegex(errors[0].message, 'transfer-converted must be a Boolean.*') - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_invalid_account_conversion(self, _, errors, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -163,7 +163,7 @@ class TestTransferAccounts(cmptest.TestCase): ''' self.assertRegex(errors[0].message, 'transfer-converted must be a Boolean.*') - @loader.load_doc(expect_errors=True) + @load_doc(expect_errors=True) def test_redundant_conversion(self, _, errors, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -181,7 +181,7 @@ class TestTransferAccounts(cmptest.TestCase): self.assertRegex( errors[0].message, 'transfer-converted was set, but there is no conversion.*') - @loader.load_doc() + @load_doc() def test_converted_price_false(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -213,7 +213,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -25.60 CAD ''', entries) - @loader.load_doc() + @load_doc() def test_converted_price_true(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -245,7 +245,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -20 USD ''', entries) - @loader.load_doc() + @load_doc() def test_converted_price_default(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -276,7 +276,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -20 USD ''', entries) - @loader.load_doc() + @load_doc() def test_converted_price_account_false(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -308,7 +308,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -25.60 CAD ''', entries) - @loader.load_doc() + @load_doc() def test_converted_price_account_true(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -340,7 +340,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -20 USD ''', entries) - @loader.load_doc() + @load_doc() def test_converted_cost_false(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -372,7 +372,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -25.60 CAD ''', entries) - @loader.load_doc() + @load_doc() def test_converted_cost_true(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -404,7 +404,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -20 USD {1.28 CAD, 2020-03-15} ''', entries) - @loader.load_doc() + @load_doc() def test_converted_cost_and_price_false(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -436,7 +436,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -25.60 CAD ''', entries) - @loader.load_doc() + @load_doc() def test_converted_cost_and_price_true(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -468,7 +468,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -20 USD {1.28 CAD, 2020-03-15} ''', entries) - @loader.load_doc() + @load_doc() def test_multiple_separate(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -508,7 +508,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -25 USD ''', entries) - @loader.load_doc() + @load_doc() def test_multiple_merge(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -545,7 +545,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -45 USD ''', entries) - @loader.load_doc() + @load_doc() def test_multiple_currencies_merge_converted_false(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" @@ -583,7 +583,7 @@ class TestTransferAccounts(cmptest.TestCase): Liabilities:CreditCard -50.60 CAD ''', entries) - @loader.load_doc() + @load_doc() def test_multiple_currencies_merge_converted_true(self, entries, _, __): ''' plugin "beancount_extras_kris7t.plugins.transfer_accounts" -- cgit v1.2.3