Replaced str.format() with f-strings in Python code.

pull/143/head
Project Nayuki 3 years ago
parent e6ef02e0f5
commit daa3114dcf

@ -180,14 +180,14 @@ def to_svg_str(qr: QrCode, border: int) -> str:
for y in range(qr.get_size()): for y in range(qr.get_size()):
for x in range(qr.get_size()): for x in range(qr.get_size()):
if qr.get_module(x, y): if qr.get_module(x, y):
parts.append("M{},{}h1v1h-1z".format(x + border, y + border)) parts.append(f"M{x+border},{y+border}h1v1h-1z")
return """<?xml version="1.0" encoding="UTF-8"?> return f"""<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 {0} {0}" stroke="none"> <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 {qr.get_size()+border*2} {qr.get_size()+border*2}" stroke="none">
<rect width="100%" height="100%" fill="#FFFFFF"/> <rect width="100%" height="100%" fill="#FFFFFF"/>
<path d="{1}" fill="#000000"/> <path d="{" ".join(parts)}" fill="#000000"/>
</svg> </svg>
""".format(qr.get_size() + border * 2, " ".join(parts)) """
def print_qr(qrcode: QrCode) -> None: def print_qr(qrcode: QrCode) -> None:

@ -93,7 +93,7 @@ class QrCode:
if version >= maxversion: # All versions in the range could not fit the given data if version >= maxversion: # All versions in the range could not fit the given data
msg: str = "Segment too long" msg: str = "Segment too long"
if datausedbits is not None: if datausedbits is not None:
msg = "Data length = {} bits, Max capacity = {} bits".format(datausedbits, datacapacitybits) msg = f"Data length = {datausedbits} bits, Max capacity = {datacapacitybits} bits"
raise DataTooLongError(msg) raise DataTooLongError(msg)
assert datausedbits is not None assert datausedbits is not None

Loading…
Cancel
Save