Fix some code style issues

changelog.md

@@ -39,7 +39,7 @@ Contributors:
  * Fix basic searching in vaults
  * Implement somewhat of a cache system like in the Java client
  * Online replay vault: fix downloading replays
- 
+
 Contributors:
  - Gatsik
 
@@ -92,15 +92,15 @@ Contributors:
 Contributors:
  - Strogo
  - muellni
- 
+
 0.18.3
 =====
  * ICE adapter debug window fixes
 
 Contributors:
  - Geosearchef
  - muellni
- 
+
 0.18.2
 =====
  * ICE adapter integration
@@ -662,7 +662,7 @@ Bugfixes
 - Fixed colouring problem with certain names
 - Automatic login will now get disabled if login fails
 - Fixed exceptions popping up related to corrupted replays
-- Logs will no longer fill to unreasonable sizes	
+- Logs will no longer fill to unreasonable sizes
 - Many other small issues fixed
 
 

res/client/client.css

@@ -259,12 +259,12 @@ QSplitter::handle:hover
      background-color: #353535;
      color: orange;
  }
- 
+
  QDateEdit:disabled
  {
      color: #8D8B85;
  }
- 
+
  QDateEdit::down-arrow
  {
      color: orange;
@@ -297,7 +297,7 @@ QSpinBox#minRating::disabled
     background-color: #4b4b4b;
 }
 
-QComboBox#filter1, #filter2, #filter3, #filter4, #filter5, #filter6, 
+QComboBox#filter1, #filter2, #filter3, #filter4, #filter5, #filter6,
 #operator1, #operator2, #operator3, #operator4, #operator5, #operator6
 {
     background-color: #353535;
@@ -310,7 +310,7 @@ QToolBox#replayToolBox::tab
     color: silver;
     border-radius: 3px;
     padding-left: 145px; /* "alignment: center" doesn't work with toolboxes :| */
-} 
+}
 
 #advancedSearch, #mapPreview
 {
@@ -374,7 +374,7 @@ QHeaderView::section
     background-color: #4b4b4b;
     font: bold;
     border-left: 1 solid;
-    
+
 }
 
 QHeaderView::down-arrow
@@ -671,15 +671,15 @@ QCheckBox#spoilerCheckbox, #automaticCheckbox, #showLatestCheckbox, #hideUnrChec
 {
     color: silver;
 }
-QCheckBox#spoilerCheckbox::indicator:unchecked, #automaticCheckbox::indicator:unchecked, #showLatestCheckbox::indicator:unchecked, 
+QCheckBox#spoilerCheckbox::indicator:unchecked, #automaticCheckbox::indicator:unchecked, #showLatestCheckbox::indicator:unchecked,
 #hideUnrCheckbox::indicator:unchecked
 ,#landRandomDensity::indicator::unchecked, #plateausRandomDensity::indicator::unchecked, #mountainsRandomDensity::indicator::unchecked
 ,#rampsRandomDensity::indicator::unchecked, #mexRandomDensity::indicator::unchecked ,#reclaimRandomDensity::indicator::unchecked
 {
     image: url('%THEMEPATH%/client/chboxUncheked.png');
  }
 
-QCheckBox#spoilerCheckbox::indicator:checked, #automaticCheckbox::indicator:checked, #showLatestCheckbox::indicator:checked, 
+QCheckBox#spoilerCheckbox::indicator:checked, #automaticCheckbox::indicator:checked, #showLatestCheckbox::indicator:checked,
 #hideUnrCheckbox::indicator:checked
 ,#landRandomDensity::indicator::checked, #plateausRandomDensity::indicator::checked, #mountainsRandomDensity::indicator::checked
 ,#rampsRandomDensity::indicator::checked, #mexRandomDensity::indicator::checked ,#reclaimRandomDensity::indicator::checked
@@ -759,7 +759,7 @@ QToolButton::checked
     background-color:#C0C0C0;
     border-radius : 5px;
  }
- 
+
 QPushButton#refreshButton, #nextButton, #previousButton, #goToPageButton, #firstButton, #lastButton,
 #resetButton, #searchPlayerButton, #UIButton, #uploadButton, #kickButton, #leaveButton
 {

res/client/randomcolors.json

@@ -1 +1 @@
-["IndianRed","LightCoral","Salmon","DarkSalmon","LightSalmon","Red","FireBrick","DarkRed","Pink","LightPink","HotPink","DeepPink","MediumVioletRed","PaleVioletRed","LightSalmon","Coral","Tomato","Gold","Yellow","LightYellow","LemonChiffon","LightGoldenrodYellow","PapayaWhip","Moccasin","PeachPuff","PaleGoldenrod","Khaki","DarkKhaki","Lavender","Thistle","Plum","Violet","Orchid","Fuchsia","Magenta","MediumOrchid","MediumPurple","Amethyst","BlueViolet","DarkViolet","DarkOrchid","DarkMagenta","Purple","SlateBlue","DarkSlateBlue","MediumSlateBlue","GreenYellow","Chartreuse","LawnGreen","Lime","LimeGreen","PaleGreen","LightGreen","MediumSpringGreen","SpringGreen","MediumSeaGreen","SeaGreen","ForestGreen","Green","DarkGreen","YellowGreen","OliveDrab","Olive","DarkOliveGreen","MediumAquamarine","DarkSeaGreen","LightSeaGreen","DarkCyan","Teal","Aqua","Cyan","LightCyan","PaleTurquoise","Aquamarine","Turquoise","MediumTurquoise","DarkTurquoise","CadetBlue","SteelBlue","LightSteelBlue","PowderBlue","SkyBlue","DeepSkyBlue","DodgerBlue","CornflowerBlue","MediumSlateBlue","RoyalBlue","Blue","MediumBlue"]
+["IndianRed","LightCoral","Salmon","DarkSalmon","LightSalmon","Red","FireBrick","DarkRed","Pink","LightPink","HotPink","DeepPink","MediumVioletRed","PaleVioletRed","LightSalmon","Coral","Tomato","Gold","Yellow","LightYellow","LemonChiffon","LightGoldenrodYellow","PapayaWhip","Moccasin","PeachPuff","PaleGoldenrod","Khaki","DarkKhaki","Lavender","Thistle","Plum","Violet","Orchid","Fuchsia","Magenta","MediumOrchid","MediumPurple","Amethyst","BlueViolet","DarkViolet","DarkOrchid","DarkMagenta","Purple","SlateBlue","DarkSlateBlue","MediumSlateBlue","GreenYellow","Chartreuse","LawnGreen","Lime","LimeGreen","PaleGreen","LightGreen","MediumSpringGreen","SpringGreen","MediumSeaGreen","SeaGreen","ForestGreen","Green","DarkGreen","YellowGreen","OliveDrab","Olive","DarkOliveGreen","MediumAquamarine","DarkSeaGreen","LightSeaGreen","DarkCyan","Teal","Aqua","Cyan","LightCyan","PaleTurquoise","Aquamarine","Turquoise","MediumTurquoise","DarkTurquoise","CadetBlue","SteelBlue","LightSteelBlue","PowderBlue","SkyBlue","DeepSkyBlue","DodgerBlue","CornflowerBlue","MediumSlateBlue","RoyalBlue","Blue","MediumBlue"]

res/coop/formatters/coop.qthtml

@@ -9,5 +9,3 @@
 </td>
 <tr>
 </table>
-
-

res/coop/formatters/style.css

@@ -33,7 +33,7 @@ QTabWidget::pane
 
 
 /* Style the tab using the tab sub-control. Note that it reads QTabBar _not_ QTabWidget */
-QTabWidget > QTabBar::tab 
+QTabWidget > QTabBar::tab
 {
     background-color:#383838;
     color: silver;
@@ -42,21 +42,21 @@ QTabWidget > QTabBar::tab
 }
 
 
-QTabWidget > QTabBar::tab:!selected 
+QTabWidget > QTabBar::tab:!selected
 {
 
     background-color: #203040;
 }
 
 
-QTabWidget > QTabBar::tab:hover 
+QTabWidget > QTabBar::tab:hover
 {
     color:white;
     background-color: #606060;
 }
 
 
-QTabWidget > QTabBar::tab:selected 
+QTabWidget > QTabBar::tab:selected
 {
     color:white;
     background-color: #303030;
@@ -106,4 +106,3 @@ body {background-color: #2f2f2f; overflow: hidden;}
     .pages .current_page {color: black;}
 
 .search_form {float: left;}
-

res/games/formatters/faf.qthtml

@@ -15,5 +15,3 @@
 </tr>
 </tbody>
 </table>
-
-

res/notification_system/dialog.ui

@@ -15,7 +15,7 @@
   </property>
   <property name="styleSheet">
    <string notr="true">QDialog {
-	
+
 	background-color: #272b30;
 }
 
@@ -56,7 +56,7 @@ QPushButton:hover {
 	background-color: rgba(0,0,0,0);
 	width: 18px;
 	height: 18px;
-	
+
 }</string>
   </property>
   <layout class="QVBoxLayout">
@@ -118,7 +118,7 @@ QPushButton:hover {
          <string notr="true">QLabel {
 	color: rgb(255, 255, 255);
     font-weight: bold;
-    font-family: Verdana; 
+    font-family: Verdana;
     font-size:13pt;
 }
 

res/stats/formatters/ladder_header.qthtml

@@ -3,4 +3,3 @@
     <th width="100%">{name}</th>
     <th align="center" width="50">{score}</th>
 </tr>
-

res/stats/formatters/style.css

@@ -14,7 +14,7 @@ QTabWidget::pane
  }
 
 /* Style the tab using the tab sub-control. Note that it reads QTabBar _not_ QTabWidget */
-QTabWidget > QTabBar::tab 
+QTabWidget > QTabBar::tab
 {
     background-color:#383838;
     color: silver;
@@ -27,7 +27,7 @@ QTabWidget > QTabBar::tab:!selected
     background-color: #203040;
 }
 
-QTabWidget > QTabBar::tab:hover 
+QTabWidget > QTabBar::tab:hover
 {
     color:white;
     background-color: #606060;

res/tournaments/formatters/open.qthtml

@@ -15,5 +15,3 @@
 
 </tbody>
 </table>
-
-

res/tournaments/formatters/style.css

@@ -13,4 +13,3 @@ QListWidget::item::hover
 {
     background-color: #555555;
 }
-

res/tutorials/formatters/tutorials.qthtml

@@ -11,5 +11,3 @@
 </tr>
 </tbody>
 </table>
-
-

res/vaults/modvault/comment.qthtml

@@ -3,4 +3,4 @@
 </table>
 <p width = 300>
 {text}
-</p>
+</p>

res/vaults/modvault/uimod.qthtml

@@ -3,4 +3,4 @@
 <p width="300">
 {description}
 </p>
-</font>
+</font>

runtests.py

@@ -1,7 +1,8 @@
 #! /usr/bin/env python3
 
-import pytest
 import sys
 
+import pytest
+
 if __name__ == '__main__':
     sys.exit(pytest.main(sys.argv[1:]))

setup.py

@@ -1,19 +1,19 @@
 import os
-import sys
 import site
+import sys
+from pathlib import Path
 
+import PyQt5.uic
 import sip
-from pathlib import Path
 
 sip.setapi('QString', 2)
 sip.setapi('QVariant', 2)
 sip.setapi('QStringList', 2)
 sip.setapi('QList', 2)
 sip.setapi('QProcess', 2)
 
-import PyQt5.uic
 if sys.platform == 'win32':
-    from cx_Freeze import setup, Executable
+    from cx_Freeze import Executable, setup
 else:
     from distutils.core import setup
 
@@ -169,5 +169,5 @@ def get_jsonschema_includes():
     maintainer='Sheeo',
     url='http://www.faforever.com',
     license='GNU General Public License, Version 3',
-    **platform_options
+    **platform_options,
 )

src/__main__.py

@@ -10,7 +10,8 @@
 
 # According to PyQt5 docs we need to import QtWebEngineWidgets before we create
 # QApplication
-from PyQt5 import QtWebEngineWidgets, QtWidgets, uic
+from PyQt5 import QtWebEngineWidgets  # noqa: F401
+from PyQt5 import QtWidgets, uic
 from PyQt5.QtCore import Qt
 
 import util

src/api/stats_api.py

@@ -1,5 +1,7 @@
-from .ApiBase import ApiBase
 import logging
+
+from .ApiBase import ApiBase
+
 logger = logging.getLogger(__name__)
 
 

src/chat/__init__.py

@@ -3,6 +3,11 @@
 from chat.chatlineedit import ChatLineEdit
 from chat.chatterlistview import ChatterListView
 
+__all__ = (
+    "ChatLineEdit",
+    "ChatterListView",
+)
+
 
 class ChatMVC:
     def __init__(

src/chat/channel_view.py

@@ -9,9 +9,12 @@
 from chat.channel_widget import ChannelWidget
 from chat.chatter_menu import ChatterMenu
 from chat.chatter_model import (
-    ChatterEventFilter, ChatterFormat,
-    ChatterItemDelegate, ChatterLayout,
-    ChatterLayoutElements, ChatterModel,
+    ChatterEventFilter,
+    ChatterFormat,
+    ChatterItemDelegate,
+    ChatterLayout,
+    ChatterLayoutElements,
+    ChatterModel,
     ChatterSortFilterModel,
 )
 from downloadManager import DownloadRequest

src/client/__init__.py

@@ -5,6 +5,10 @@
 
 from ._clientwindow import ClientWindow
 
+__all__ = (
+    "ThemeMenu",
+)
+
 logger = logging.getLogger(__name__)
 
 instance = ClientWindow()

src/client/_clientwindow.py

@@ -24,25 +24,33 @@
 from chat.ircconnection import IrcConnection
 from chat.language_channel_config import LanguageChannelConfig
 from chat.line_restorer import ChatLineRestorer
-from client.clientstate import ClientState
 from client.aliasviewer import AliasSearchWindow, AliasWindow
 from client.chat_config import ChatConfig
+from client.clientstate import ClientState
 from client.connection import (
-    ConnectionState, Dispatcher, LobbyInfo,
-    ServerConnection, ServerReconnecter,
+    ConnectionState,
+    Dispatcher,
+    LobbyInfo,
+    ServerConnection,
+    ServerReconnecter,
 )
 from client.gameannouncer import GameAnnouncer
 from client.login import LoginWidget
 from client.playercolors import PlayerColors
 from client.theme_menu import ThemeMenu
 from client.user import (
-    User, UserRelationController, UserRelationModel,
-    UserRelations, UserRelationTrackers,
+    User,
+    UserRelationController,
+    UserRelationModel,
+    UserRelations,
+    UserRelationTrackers,
 )
 from connectivity.ConnectivityDialog import ConnectivityDialog
 from coop import CoopWidget
 from downloadManager import (
-    MAP_PREVIEW_ROOT, AvatarDownloader, PreviewDownloader,
+    MAP_PREVIEW_ROOT,
+    AvatarDownloader,
+    PreviewDownloader,
 )
 from fa.factions import Factions
 from fa.game_runner import GameRunner

src/client/aliasviewer.py

@@ -1,7 +1,7 @@
 import logging
 
 from PyQt5 import QtWidgets
-from PyQt5.QtCore import QDateTime, QTimer, Qt
+from PyQt5.QtCore import QDateTime, Qt, QTimer
 
 from api.player_api import PlayerApiConnector
 

src/coop/__init__.py

@@ -3,4 +3,8 @@
 # For use by other modules
 from ._coopwidget import CoopWidget
 
+__all__ = (
+    "CoopWidget",
+)
+
 logger = logging.getLogger(__name__)