From da2f45b371075b56c9b4d5918a8f9c3d20fce82f Mon Sep 17 00:00:00 2001 From: nyov Date: Tue, 5 Jun 2012 04:02:27 +0200 Subject: [PATCH] Some code format changes for better readability --- xonstat/__init__.py | 60 ++++++++++++++------------------------- xonstat/models.py | 27 ++++++------------ xonstat/views/__init__.py | 7 +++-- 3 files changed, 35 insertions(+), 59 deletions(-) diff --git a/xonstat/__init__.py b/xonstat/__init__.py index 5a164ef..2e45a08 100644 --- a/xonstat/__init__.py +++ b/xonstat/__init__.py @@ -2,7 +2,7 @@ import sqlahelper from pyramid.config import Configurator from sqlalchemy import engine_from_config from xonstat.models import initialize_db -from xonstat.views import * +from xonstat.views import * def main(global_config, **settings): """ This function returns a Pyramid WSGI application. @@ -20,74 +20,58 @@ def main(global_config, **settings): # ROOT ROUTE config.add_route("main_index", "/") - config.add_view(main_index, route_name="main_index", - renderer="main_index.mako") + config.add_view(main_index, route_name="main_index", renderer="main_index.mako") # MAIN SUBMISSION ROUTE config.add_route("stats_submit", "stats/submit") config.add_view(stats_submit, route_name="stats_submit") # PLAYER ROUTES - config.add_route("player_game_index", - "/player/{player_id:\d+}/games") - config.add_view(player_game_index, route_name="player_game_index", - renderer="player_game_index.mako") + config.add_route("player_game_index", "/player/{player_id:\d+}/games") + config.add_view(player_game_index, route_name="player_game_index", renderer="player_game_index.mako") config.add_route("player_index", "/players") - config.add_view(player_index, route_name="player_index", - renderer="player_index.mako") + config.add_view(player_index, route_name="player_index", renderer="player_index.mako") config.add_route("player_info", "/player/{id:\d+}") - config.add_view(player_info, route_name="player_info", - renderer="player_info.mako") + config.add_view(player_info, route_name="player_info", renderer="player_info.mako") - config.add_route("player_accuracy", "/player/{id:\d+}/accuracy") - config.add_view(player_accuracy_json, route_name="player_accuracy", - renderer="json") + config.add_route("player_accuracy", "/player/{id:\d+}/accuracy") + config.add_route("player_accuracy_json", "/player/{id:\d+}/accuracy.json") + config.add_view(player_accuracy_json, route_name="player_accuracy", renderer="json") + config.add_view(player_accuracy_json, route_name="player_accuracy_json", renderer="json") # GAME ROUTES config.add_route("game_index", "/games") - config.add_view(game_index, route_name="game_index", - renderer="game_index.mako") + config.add_view(game_index, route_name="game_index", renderer="game_index.mako") config.add_route("game_info", "/game/{id:\d+}") - config.add_view(game_info, route_name="game_info", - renderer="game_info.mako") + config.add_view(game_info, route_name="game_info", renderer="game_info.mako") config.add_route("rank_index", "/ranks/{game_type_cd:ctf|dm|tdm|duel}") - config.add_view(rank_index, route_name="rank_index", - renderer="rank_index.mako") + config.add_view(rank_index, route_name="rank_index", renderer="rank_index.mako") # SERVER ROUTES config.add_route("server_index", "/servers") - config.add_view(server_index, route_name="server_index", - renderer="server_index.mako") + config.add_view(server_index, route_name="server_index", renderer="server_index.mako") - config.add_route("server_game_index", - "/server/{server_id:\d+}/games/page/{page:\d+}") - config.add_view(server_game_index, route_name="server_game_index", - renderer="server_game_index.mako") + config.add_route("server_game_index", "/server/{server_id:\d+}/games/page/{page:\d+}") + config.add_view(server_game_index, route_name="server_game_index", renderer="server_game_index.mako") config.add_route("server_info", "/server/{id:\d+}") - config.add_view(server_info, route_name="server_info", - renderer="server_info.mako") + config.add_view(server_info, route_name="server_info", renderer="server_info.mako") # MAP ROUTES + config.add_route("map_index", "/maps") config.add_route("map_index_json", "/maps.json") - config.add_view(map_index_json, route_name="map_index_json", - renderer="json") - - config.add_route("map_index", "/maps") - config.add_view(map_index, route_name="map_index", - renderer="map_index.mako") + config.add_view(map_index, route_name="map_index", renderer="map_index.mako") + config.add_view(map_index_json, route_name="map_index_json", renderer="json") config.add_route("map_info", "/map/{id:\d+}") - config.add_view(map_info, route_name="map_info", - renderer="map_info.mako") + config.add_view(map_info, route_name="map_info", renderer="map_info.mako") # SEARCH ROUTES config.add_route("search", "search") - config.add_view(search, route_name="search", - renderer="search.mako") + config.add_view(search, route_name="search", renderer="search.mako") return config.make_wsgi_app() diff --git a/xonstat/models.py b/xonstat/models.py index d5cd885..949f90c 100644 --- a/xonstat/models.py +++ b/xonstat/models.py @@ -34,20 +34,17 @@ class Player(object): return pretty_date(self.create_dt) def __repr__(self): - return "" % (self.player_id, - self.nick.encode('utf-8')) + return "" % (self.player_id, self.nick.encode('utf-8')) class GameType(object): def __repr__(self): - return "" % (self.game_type_cd, self.descr, - self.active_ind) + return "" % (self.game_type_cd, self.descr, self.active_ind) class Weapon(object): def __repr__(self): - return "" % (self.weapon_cd, self.descr, - self.active_ind) + return "" % (self.weapon_cd, self.descr, self.active_ind) class Server(object): @@ -82,8 +79,7 @@ class Game(object): self.winner = winner def __repr__(self): - return "" % (self.game_id, self.start_dt, - self.game_type_cd, self.server_id) + return "" % (self.game_id, self.start_dt, self.game_type_cd, self.server_id) def fuzzy_date(self): return pretty_date(self.start_dt) @@ -201,8 +197,7 @@ class PlayerGameStat(object): self.create_dt = create_dt def __repr__(self): - return "" \ - % (self.player_id, self.game_id, self.create_dt) + return "" % (self.player_id, self.game_id, self.create_dt) def nick_stripped(self): if self.nick is None: @@ -231,8 +226,7 @@ class PlayerGameStat(object): class Achievement(object): def __repr__(self): - return "" % (self.achievement_cd, self.descr, - self.limit) + return "" % (self.achievement_cd, self.descr, self.limit) class PlayerAchievement(object): @@ -242,8 +236,7 @@ class PlayerAchievement(object): class PlayerWeaponStat(object): def __repr__(self): - return "" % (self.player_weapon_stats_id, - self.player_id, self.game_id) + return "" % (self.player_weapon_stats_id, self.player_id, self.game_id) class Hashkey(object): @@ -270,8 +263,7 @@ class PlayerElo(object): self.elo = ELOPARMS.initial def __repr__(self): - return "" % \ - (self.player_id, self.game_type_cd, self.elo) + return "" % (self.player_id, self.game_type_cd, self.elo) class PlayerRank(object): @@ -284,8 +276,7 @@ class PlayerRank(object): def __repr__(self): - return "" % \ - (self.player_id, self.game_type_cd, self.rank) + return "" % (self.player_id, self.game_type_cd, self.rank) def initialize_db(engine=None): diff --git a/xonstat/views/__init__.py b/xonstat/views/__init__.py index ee632ae..e7f6e38 100644 --- a/xonstat/views/__init__.py +++ b/xonstat/views/__init__.py @@ -1,8 +1,9 @@ from xonstat.views.submission import stats_submit from xonstat.views.player import player_index, player_info, player_game_index from xonstat.views.player import player_accuracy_json -from xonstat.views.game import game_index, game_info, rank_index -from xonstat.views.map import map_info, map_index, map_index_json +from xonstat.views.game import game_index, game_info, rank_index +from xonstat.views.map import map_info, map_index +from xonstat.views.map import map_index_json from xonstat.views.server import server_info, server_game_index, server_index from xonstat.views.search import search_q, search -from xonstat.views.main import main_index +from xonstat.views.main import main_index -- 2.39.2