From 73a5f9dc0937bd9312d864e799f97e4c17699cbf Mon Sep 17 00:00:00 2001 From: Dmitry Borzenin Date: Fri, 7 Feb 2020 16:51:22 +0300 Subject: [PATCH] Refactoring in NewsSlag parser --- apps/utils/parsers.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/utils/parsers.py b/apps/utils/parsers.py index 30ed754e..073aa1e4 100644 --- a/apps/utils/parsers.py +++ b/apps/utils/parsers.py @@ -1,9 +1,9 @@ class NewsSlug: - def __init__(self, value=None, locale=None, count=0): + def __init__(self, value=None, country_code=None, count=0): self.value = value - self.locale = locale + self.country_code = country_code self.count = count @classmethod @@ -13,10 +13,10 @@ class NewsSlug: if len(rest) >= 1 and rest[-1] in country_codes: instance.value = '-'.join([slug, *rest[:-1]]) - instance.locale = rest[-1] + instance.country_code = rest[-1] elif len(rest) >= 2 and rest[-1].isdigit() and rest[-2] in country_codes: instance.value = '-'.join([slug, *rest[:-2]]) - instance.locale = rest[-2] + instance.country_code = rest[-2] instance.count = int(rest[-1]) else: instance.value = '-'.join([slug, *rest]) @@ -31,8 +31,8 @@ class NewsSlug: raise ValueError('No value for slug') slug_parts = [self.value] - if self.locale is not None: - slug_parts.append(self.locale) + if self.country_code is not None: + slug_parts.append(self.country_code) if self.count != 0: slug_parts.append(str(self.count)) @@ -40,4 +40,4 @@ class NewsSlug: return '-'.join(slug_parts) def __repr__(self): - return f'<{self.__class__.__name__} {self.value}, {self.locale}, {self.count}>' + return f'<{self.__class__.__name__} {self.value}, {self.country_code}, {self.count}>'