From d25e97b2bdbfc9e91b538542d6d5b228f96ca035 Mon Sep 17 00:00:00 2001 From: Thorge Petersen <petersen@rz.uni-kiel.de> Date: Tue, 3 Jan 2023 15:26:32 +0100 Subject: [PATCH] No need to decode as utf8, py3 strings are already decoded --- ckanext/odsh/pretty_daterange/date_range_formatter.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ckanext/odsh/pretty_daterange/date_range_formatter.py b/ckanext/odsh/pretty_daterange/date_range_formatter.py index a9018737..4b6a3fcb 100644 --- a/ckanext/odsh/pretty_daterange/date_range_formatter.py +++ b/ckanext/odsh/pretty_daterange/date_range_formatter.py @@ -72,24 +72,19 @@ class DateRangeFormatter(object): def _construct_single_date_string(self, date, format): return format_date(date, format=format, locale=self.locale_for_date_strings) - - @staticmethod - def _as_utf_8(s): - return '' + s.decode('utf-8') - def _construct_half_of_year_date_string(self): year = self.date_start.year half = self._date_range.get_half_year(self.date_start) half_of_year_date_string = '{}. Halbjahr {}'.format(half, year) - return DateRangeFormatter._as_utf_8(half_of_year_date_string) + return half_of_year_date_string def _construct_quarter_of_year_date_string(self): year = self.date_start.year quarter = self._date_range.get_quarter(self.date_start) quarter_of_year_date_string = '{}. Quartal {}'.format(quarter, year) - return DateRangeFormatter._as_utf_8(quarter_of_year_date_string) + return quarter_of_year_date_string def _construct_date_range_string(self, format_date_start, format_date_end): -- GitLab