Skip to content

refactor: Use camel case #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rmqrcode/format/data_capacities.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


# ISO/IEC 23941:2022 Table 6
data_capacities = {
DataCapacities = {
'R7x43': {
'height': 7,
'width': 43,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from .error_correction_level import ErrorCorrectionLevel


qr_versions = {
rMQRVersions = {
'R7x43': {
'version_indicator': 0b00000,
'height': 7,
Expand Down
14 changes: 7 additions & 7 deletions src/rmqrcode/rmqrcode.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .format.error_correction_level import ErrorCorrectionLevel
from .format.qr_versions import qr_versions
from .format.data_capacities import data_capacities
from .format.rmqr_versions import rMQRVersions
from .format.data_capacities import DataCapacities
from .format.alignment_pattern_coordinates import AlignmentPatternCoordinates
from .format.generator_polynomials import GeneratorPolynomials
from .format.mask import mask
Expand Down Expand Up @@ -33,7 +33,7 @@ def fit(data,ecc=ErrorCorrectionLevel.M, fit_strategy=FitStrategy.BALANCED):
determined_height = set()

logger.debug("Select rMQR Code version")
for version_name, qr_version in data_capacities.items():
for version_name, qr_version in DataCapacities.items():
if data_length <= qr_version['capacity']['Byte'][ecc]:
width, height = qr_version['width'], qr_version['height']
if not width in determined_width and not height in determined_height:
Expand Down Expand Up @@ -69,7 +69,7 @@ def __init__(self, version, ecc, logger=None):
if not rMQR.validate_version(version):
raise IllegalVersionError("The rMQR version is illegal.")

qr_version = qr_versions[version]
qr_version = rMQRVersions[version]
self._version = version
self._height = qr_version['height']
self._width = qr_version['width']
Expand Down Expand Up @@ -248,7 +248,7 @@ def _put_version_information_finder_sub_pattern_side(self, version_information):


def _compute_version_info(self):
qr_version = qr_versions[self.version_name()]
qr_version = rMQRVersions[self.version_name()]
version_information_data = qr_version['version_indicator']
if self._error_correction_level == ErrorCorrectionLevel.H:
version_information_data |= 1<<6
Expand All @@ -258,7 +258,7 @@ def _compute_version_info(self):


def _put_data(self, data):
qr_version = qr_versions[self.version_name()]
qr_version = rMQRVersions[self.version_name()]

character_count_length = qr_version['character_count_length']
codewords_total = qr_version['codewords_total']
Expand Down Expand Up @@ -393,7 +393,7 @@ def _apply_mask(self, mask_area):

@staticmethod
def validate_version(version_name):
return version_name in qr_versions
return version_name in rMQRVersions


class DataTooLongError(ValueError):
Expand Down