Replace configparser with tomllib

This commit is contained in:
2026-01-25 17:50:22 +09:00
parent cb385097dc
commit ecaec99212
15 changed files with 71 additions and 70 deletions
+4 -4
View File
@@ -37,7 +37,7 @@ When finished, write an empty line to confirm the purchase.\n"""
"""
assert isinstance(user, User)
return user.credit > config.getint("limits", "low_credit_warning_limit")
return user.credit > config["limits"]["low_credit_warning_limit"]
def low_credit_warning(self, user, timeout=False):
assert isinstance(user, User)
@@ -58,7 +58,7 @@ When finished, write an empty line to confirm the purchase.\n"""
print("***********************************************************************")
print("")
print(
f"USER {user.name} HAS LOWER CREDIT THAN {config.getint('limits', 'low_credit_warning_limit'):d}."
f"USER {user.name} HAS LOWER CREDIT THAN {config['limits']['low_credit_warning_limit']:d}."
)
print("THIS PURCHASE WILL CHARGE YOUR CREDIT TWICE AS MUCH.")
print("CONSIDER PUTTING MONEY IN THE BOX TO AVOID THIS.")
@@ -178,9 +178,9 @@ When finished, write an empty line to confirm the purchase.\n"""
for t in self.purchase.transactions:
if not t.user.is_anonymous():
print(f"User {t.user.name}'s credit is now {t.user.credit:d} kr")
if t.user.credit < config.getint("limits", "low_credit_warning_limit"):
if t.user.credit < config["limits"]["low_credit_warning_limit"]:
print(
f"USER {t.user.name} HAS LOWER CREDIT THAN {config.getint('limits', 'low_credit_warning_limit'):d},",
f"USER {t.user.name} HAS LOWER CREDIT THAN {config['limits']['low_credit_warning_limit']:d},",
"AND SHOULD CONSIDER PUTTING SOME MONEY IN THE BOX.",
)
+2 -2
View File
@@ -5,7 +5,7 @@ import re
import sys
from select import select
from dibbler.db import Session
from dibbler.db import session as create_session
from dibbler.models import User
from dibbler.lib.helpers import (
search_user,
@@ -485,7 +485,7 @@ class Menu(object):
self.set_context(None)
try:
if self.uses_db and not self.session:
self.session = Session()
self.session = create_session()
return self._execute(**kwargs)
except ExitMenu:
self.at_exit()
+2 -2
View File
@@ -3,7 +3,7 @@ import os
import random
import sys
from dibbler.db import Session
from dibbler.db import session as create_session
from .buymenu import BuyMenu
from .faq import FAQMenu
@@ -28,7 +28,7 @@ class MainMenu(Menu):
else:
num = 1
item_name = in_str
buy_menu = BuyMenu(Session())
buy_menu = BuyMenu(create_session())
thing = buy_menu.search_for_thing(item_name, find_hidden_products=False)
if thing:
buy_menu.execute(initial_contents=[(thing, num)])
+2 -2
View File
@@ -56,7 +56,7 @@ class ShowUserMenu(Menu):
(
"transactions",
"Recent transactions (List of last "
+ str(config.getint("limits", "user_recent_transaction_limit"))
+ str(config["limits"]["user_recent_transaction_limit"])
+ ")",
),
("products", f"Which products {user.name} has bought, and how many"),
@@ -65,7 +65,7 @@ class ShowUserMenu(Menu):
)
what = selector.execute()
if what == "transactions":
self.print_transactions(user, config.getint("limits", "user_recent_transaction_limit"))
self.print_transactions(user, config["limits"]["user_recent_transaction_limit"])
elif what == "products":
self.print_purchased_products(user)
elif what == "transactions-all":
+3 -3
View File
@@ -32,14 +32,14 @@ Put it up somewhere in the vicinity.
thing.bar_code,
thing.name,
barcode_type=bar_type,
rotate=config.getboolean("printer", "rotate"),
rotate=config["printer"]["rotate"],
printer_type="QL-700",
label_type=config.get("printer", "label_type"),
)
elif isinstance(thing, User):
print_name_label(
text=thing.name,
label_type=config.get("printer", "label_type"),
rotate=config.getboolean("printer", "rotate"),
label_type=config["printer"]["label_type"],
rotate=config["printer"]["rotate"],
printer_type="QL-700",
)