#99 fixed some staticmethods

Author: Sh4kE

core/managers/parser_manager.py

@@ -33,12 +33,14 @@ def reset_parsing_flags(self):
         self.parsed_matchday = None
         self.players_already_parsed = False
 
-    def parse_ofm_version(self, site_manager):
+    @staticmethod
+    def parse_ofm_version(site_manager):
         site_manager.jump_to_frame(Constants.GitHub.LATEST_RELEASE)
         version_parser = OfmHelperVersionParser(site_manager.browser.page_source)
         return version_parser.parse()
 
-    def parse_matchday(self, request, site_manager):
+    @staticmethod
+    def parse_matchday(request, site_manager):
         site_manager.jump_to_frame(Constants.HEAD)
         matchday_parser = MatchdayParser(site_manager.browser.page_source)
         return matchday_parser.parse()
@@ -108,7 +110,8 @@ def _parse_single_match(self, request, site_manager, row):
         else:
             return WonByDefaultMatchRowParser(row, request.user).parse()
 
-    def _parse_stadium_statistics(self, request, site_manager, match):
+    @staticmethod
+    def _parse_stadium_statistics(request, site_manager, match):
         site_manager.jump_to_frame(Constants.Stadium.ENVIRONMENT)
         stadium_statistics_parser = StadiumStatisticsParser(site_manager.browser.page_source, request.user, match)
         stadium_statistics_parser.parse()

core/ofm_views.py

@@ -39,9 +39,8 @@ def get(self, request, *args, **kwargs):
         contracts = Contract.objects.filter(user=self.request.user, sold_on_matchday=None)
         players = [contract.player for contract in contracts]
         current_matchday = Matchday.objects.all()[0]
-        current_season = current_matchday.season
 
-        newer_matchday_season = self.request.GET.get('newer_matchday_season', default=current_season.number)
+        newer_matchday_season = self.request.GET.get('newer_matchday_season', default=current_matchday.season.number)
         newer_matchday = self.request.GET.get('newer_matchday', default=current_matchday.number)
         older_matchday_season = self.request.GET.get('older_matchday_season')
         older_matchday = self.request.GET.get('older_matchday')
@@ -60,11 +59,12 @@ def get(self, request, *args, **kwargs):
         player_statistics_json = [
             self._get_player_statistics_diff_in_json(newer_player_statistics, older_player_statistics)
             for (newer_player_statistics, older_player_statistics) in player_statistics_tuples
-            ]
+        ]
 
         return self.render_json_response(player_statistics_json)
 
-    def _get_statistics_from_player_and_matchday(self, player,
+    @staticmethod
+    def _get_statistics_from_player_and_matchday(player,
                                                  newer_matchday_season, newer_matchday,
                                                  older_matchday_season, older_matchday):
 
@@ -90,7 +90,8 @@ def _get_statistics_from_player_and_matchday(self, player,
 
         return newer_player_statistics, older_player_statistics
 
-    def _get_player_statistics_diff_in_json(self, newer_player_statistics, older_player_statistics):
+    @staticmethod
+    def _get_player_statistics_diff_in_json(newer_player_statistics, older_player_statistics):
         """
         Args:
             newer_player_statistics: newer statistic
@@ -245,12 +246,9 @@ def get(self, request, *args, **kwargs):
 
         return self.render_json_response(finances_json)
 
-    def _get_finances_diff_in_json(self, newer_finances, older_finances):
+    @staticmethod
+    def _get_finances_diff_in_json(newer_finances, older_finances):
         """
-        Args:
-            newer_finances: newer finances
-            older_finances: older finances
-
         Returns:
             A dictionary of finance data. If older_finances is None newer_finances is returned
         """
@@ -430,7 +428,7 @@ def get(self, request, *args, **kwargs):
             income_betting.append(data_source[0].income_betting)
             matchdays.append(data_source[0].matchday.number)
 
-        for idx, entry in enumerate(data_source):
+        for idx, _ in enumerate(data_source):
             if idx + 1 < data_source.count():
                 income_visitors_league.append(
                     data_source[idx + 1].income_visitors_league - data_source[idx].income_visitors_league)
@@ -508,7 +506,7 @@ def get(self, request, *args, **kwargs):
             expenses_betting.append(-data_source[0].expenses_betting)
             matchdays.append(data_source[0].matchday.number)
 
-        for idx, entry in enumerate(data_source):
+        for idx, _ in enumerate(data_source):
             if idx + 1 < data_source.count():
                 expenses_player_salaries.append(
                     data_source[idx].expenses_player_salaries - data_source[idx + 1].expenses_player_salaries)
@@ -580,11 +578,9 @@ def get(self, request, *args, **kwargs):
 
         return self.render_json_response(match_json)
 
-    def _get_match_in_json(self, match):
+    @staticmethod
+    def _get_match_in_json(match):
         """
-        Args:
-            match: Match
-
         Returns:
             A dictionary of match data.
         """
@@ -746,11 +742,9 @@ def get(self, request, *args, **kwargs):
 
         return self.render_json_response(stadium_statistics_json)
 
-    def _get_stadium_statistics_in_json(self, stadium_stat):
+    @staticmethod
+    def _get_stadium_statistics_in_json(stadium_stat):
         """
-        Args:
-            stadium_stat: MatchStadiumStatistics
-
         Returns:
             A dictionary of stadium statistics data.
         """

core/parsers/base_parser.py

@@ -11,12 +11,14 @@ def __init__(self):
     def parse(self):
         raise NotImplementedError("Should have implemented this")
 
-    def _filter_invalid_cells(self, table_cells):
+    @staticmethod
+    def _filter_invalid_cells(table_cells):
         import re
         counter_cell_pattern = re.compile(r'<td>[0-9]+</td>')
         return [cell for cell in table_cells
                 if str(cell).replace(' ', '').replace('\t', '').replace('\n', '') != '<td>??</td>' and not
                 counter_cell_pattern.match(str(cell))]
 
-    def strip_euro_sign(self, money):
+    @staticmethod
+    def strip_euro_sign(money):
         return money[:-2]

core/parsers/player_statistics_parser.py

@@ -104,10 +104,12 @@ def _create_contract(self, player):
             )
         return contract
 
-    def _get_value_from_multivalue_table_cell(self, field, index):
+    @staticmethod
+    def _get_value_from_multivalue_table_cell(field, index):
         return field.get_text().split(MULTIVALUE_SEPARATOR)[index].strip()
 
-    def _get_ep_tp_value_from_table_cell(self, field):
+    @staticmethod
+    def _get_ep_tp_value_from_table_cell(field):
         return field.get_text().strip('\n').split('\n')[0].strip('\n').strip('\t').replace('.', '')
 
     def _get_equity_value_from_table_cell(self, field):

core/parsers/stadium_statistics_parser.py

@@ -41,22 +41,22 @@ def parse_html(self, soup):
         security_row = stadium_items[2]
         parking_row = stadium_items[3]
 
-        if StadiumStatisticsParser._is_under_construction(light_row) and last_stadium_level:
+        if self._is_under_construction(light_row) and last_stadium_level:
             light = last_stadium_level.light
         else:
             light = self._create_stadium_level_item_from_row(light_row)
 
-        if StadiumStatisticsParser._is_under_construction(screen_row) and last_stadium_level:
+        if self._is_under_construction(screen_row) and last_stadium_level:
             screen = last_stadium_level.screen
         else:
             screen = self._create_stadium_level_item_from_row(screen_row)
 
-        if StadiumStatisticsParser._is_under_construction(security_row) and last_stadium_level:
+        if self._is_under_construction(security_row) and last_stadium_level:
             security = last_stadium_level.security
         else:
             security = self._create_stadium_level_item_from_row(security_row)
 
-        if StadiumStatisticsParser._is_under_construction(parking_row) and last_stadium_level:
+        if self._is_under_construction(parking_row) and last_stadium_level:
             parking = last_stadium_level.parking
         else:
             parking = self._create_stadium_level_item_from_row(parking_row)
@@ -80,11 +80,12 @@ def _is_under_construction(stadium_attribute):
         return stadium_attribute.find_all('td')[1].img is not None and \
                'underconst' in stadium_attribute.find_all('td')[1].img['src']
 
-    def _create_stadium_level_item_from_row(self, row):
+    @staticmethod
+    def _create_stadium_level_item_from_row(row):
         stadium_level_item, _ = StadiumLevelItem.objects.get_or_create(
             current_level=row.find_all('td')[2].span.get_text(),
-            value=self.strip_euro_sign(row.find_all('td')[4].span.get_text().replace('.', '').strip()),
-            daily_costs=self.strip_euro_sign(row.find_all('td')[5].span.get_text().replace('.', '').strip())
+            value=BaseParser.strip_euro_sign(row.find_all('td')[4].span.get_text().replace('.', '').strip()),
+            daily_costs=BaseParser.strip_euro_sign(row.find_all('td')[5].span.get_text().replace('.', '').strip())
         )
 
         return stadium_level_item

core/views.py

@@ -160,11 +160,10 @@ def get(self, request, *args, **kwargs):
 class GetChecklistItemsForTodayView(CsrfExemptMixin, JsonRequestResponseMixin, View):
     def get(self, request, *args, **kwargs):
         current_matchday = Matchday.get_current()
-        next_matchday_number = current_matchday.number + 1
         home_match_tomorrow = Match.objects.filter(
             user=request.user,
             matchday__season__number=current_matchday.season.number,
-            matchday__number=next_matchday_number,
+            matchday__number=current_matchday.number + 1,
             is_home_match=True
         )
         checklist_items = ChecklistItem.objects.filter(checklist__user=request.user)