diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 950254a53e8..235e9ba9b79 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: - run: pip install bandit black codespell flake8 mypy pyupgrade safety pylint==2.10.2 - run: pip install types-pytz types-requests types-termcolor types-tabulate types-PyYAML types-python-dateutil - - run: bandit -r . || true + - run: bandit -x ./tests -r . || true - run: black --check . - run: codespell --ignore-words-list=pres,hsi,hist,mape,ba,ser,coo --quiet-level=2 --skip=".git" --skip="*.yaml" --skip="*.ipynb" --skip="*.json" --skip="*.js" --skip="*.css" --skip="*.scss" --skip="*.html" --skip="*.ini" --skip="*.lock" --skip="*.csv" - run: flake8 . --count --ignore=E203,W503 --max-line-length=122 --show-source --statistics diff --git a/gamestonk_terminal/cryptocurrency/crypto_controller.py b/gamestonk_terminal/cryptocurrency/crypto_controller.py index 0dbe7463c4d..42a6841b6db 100644 --- a/gamestonk_terminal/cryptocurrency/crypto_controller.py +++ b/gamestonk_terminal/cryptocurrency/crypto_controller.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" # pylint: disable=R0904, C0302, R1710, W0622 import argparse -import os import matplotlib.pyplot as plt import pandas as pd from colorama import Style @@ -14,6 +13,7 @@ from gamestonk_terminal.helper_funcs import ( get_flair, parse_known_args_and_warn, check_positive, + system_clear, MENU_GO_BACK, MENU_QUIT, MENU_RESET, @@ -157,7 +157,7 @@ What do you want to do? # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/cryptocurrency/defi/defi_controller.py b/gamestonk_terminal/cryptocurrency/defi/defi_controller.py index 840f66e0b0d..9ac22e1ac4e 100644 --- a/gamestonk_terminal/cryptocurrency/defi/defi_controller.py +++ b/gamestonk_terminal/cryptocurrency/defi/defi_controller.py @@ -1,7 +1,6 @@ """Defi Controller Module""" __docformat__ = "numpy" -import os import argparse from typing import List from prompt_toolkit.completion import NestedCompleter @@ -13,6 +12,7 @@ from gamestonk_terminal.helper_funcs import ( parse_known_args_and_warn, check_positive, try_except, + system_clear, ) from gamestonk_terminal.cryptocurrency.defi import ( @@ -84,7 +84,7 @@ class DefiController: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( @@ -421,7 +421,7 @@ class DefiController: if not ns_parser: return - defirate_view.dislpay_lending_rates( + defirate_view.display_lending_rates( top=ns_parser.top, current=ns_parser.current, export=ns_parser.export ) @@ -476,7 +476,7 @@ def print_help(): print(" tvl Total value locked of DeFi protocols") print(" newsletter Recent DeFi related newsletters") print(" dpi DeFi protocols listed on DefiPulse") - print(" funding Funding reates - current or last 30 days average") + print(" funding Funding rates - current or last 30 days average") print(" borrow DeFi borrow rates - current or last 30 days average") print(" lending DeFi ending rates - current or last 30 days average") print("") diff --git a/gamestonk_terminal/cryptocurrency/defi/defirate_view.py b/gamestonk_terminal/cryptocurrency/defi/defirate_view.py index 99cebb283bf..6414190a748 100644 --- a/gamestonk_terminal/cryptocurrency/defi/defirate_view.py +++ b/gamestonk_terminal/cryptocurrency/defi/defirate_view.py @@ -48,7 +48,7 @@ def display_funding_rates(top: int, current: bool = True, export: str = "") -> N ) -def dislpay_lending_rates(top: int, current: bool = True, export: str = "") -> None: +def display_lending_rates(top: int, current: bool = True, export: str = "") -> None: """Displays top DeFi lendings. Decentralized Finance lending – allows users to supply cryptocurrencies in exchange for earning an annualized return [Source: https://defirate.com/] diff --git a/gamestonk_terminal/cryptocurrency/discovery/discovery_controller.py b/gamestonk_terminal/cryptocurrency/discovery/discovery_controller.py index b45d94c80dd..fe43da22640 100644 --- a/gamestonk_terminal/cryptocurrency/discovery/discovery_controller.py +++ b/gamestonk_terminal/cryptocurrency/discovery/discovery_controller.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" # pylint: disable=R0904, C0302, W0622 import argparse -import os from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal import feature_flags as gtff from gamestonk_terminal.helper_funcs import ( @@ -11,6 +10,7 @@ from gamestonk_terminal.helper_funcs import ( parse_known_args_and_warn, check_positive, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.cryptocurrency.discovery import ( @@ -109,7 +109,7 @@ CoinMarketCap: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/cryptocurrency/due_diligence/dd_controller.py b/gamestonk_terminal/cryptocurrency/due_diligence/dd_controller.py index d8e2665b8cc..bb8a4daacf1 100644 --- a/gamestonk_terminal/cryptocurrency/due_diligence/dd_controller.py +++ b/gamestonk_terminal/cryptocurrency/due_diligence/dd_controller.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" # pylint: disable=R0904, C0302, W0622 import argparse -import os import pandas as pd from binance.client import Client from prompt_toolkit.completion import NestedCompleter @@ -23,6 +22,7 @@ from gamestonk_terminal.helper_funcs import ( parse_known_args_and_warn, check_positive, try_except, + system_clear, ) from gamestonk_terminal.cryptocurrency.due_diligence.coinpaprika_view import CURRENCIES @@ -165,7 +165,7 @@ Coinbase: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/cryptocurrency/onchain/onchain_controller.py b/gamestonk_terminal/cryptocurrency/onchain/onchain_controller.py index e8459a15eac..315bb1ee99f 100644 --- a/gamestonk_terminal/cryptocurrency/onchain/onchain_controller.py +++ b/gamestonk_terminal/cryptocurrency/onchain/onchain_controller.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" # pylint: disable=C0302 -import os import argparse from typing import List from datetime import datetime, timedelta @@ -19,6 +18,7 @@ from gamestonk_terminal.helper_funcs import ( check_int_range, valid_date, try_except, + system_clear, ) from gamestonk_terminal.cryptocurrency.onchain import ( @@ -113,7 +113,7 @@ class OnchainController: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/cryptocurrency/overview/overview_controller.py b/gamestonk_terminal/cryptocurrency/overview/overview_controller.py index 12d391bea99..3633deac1b7 100644 --- a/gamestonk_terminal/cryptocurrency/overview/overview_controller.py +++ b/gamestonk_terminal/cryptocurrency/overview/overview_controller.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" # pylint: disable=R0904, C0302, W0622 import argparse -import os from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal import feature_flags as gtff from gamestonk_terminal.helper_funcs import ( @@ -11,6 +10,7 @@ from gamestonk_terminal.helper_funcs import ( parse_known_args_and_warn, check_positive, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.cryptocurrency.overview import ( @@ -129,7 +129,7 @@ Coinbase: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/cryptocurrency/technical_analysis/ta_controller.py b/gamestonk_terminal/cryptocurrency/technical_analysis/ta_controller.py index 77db3c214a6..61d6399a570 100644 --- a/gamestonk_terminal/cryptocurrency/technical_analysis/ta_controller.py +++ b/gamestonk_terminal/cryptocurrency/technical_analysis/ta_controller.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" # pylint:disable=too-many-lines import argparse -import os from typing import List from datetime import datetime from colorama import Style @@ -20,6 +19,7 @@ from gamestonk_terminal.helper_funcs import ( check_positive, valid_date, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.common.technical_analysis import ( @@ -149,7 +149,7 @@ Custom: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( @@ -1138,7 +1138,7 @@ Custom: add_help=False, formatter_class=argparse.ArgumentDefaultsHelpFormatter, prog="fib", - description="Calculates the fibinocci retracement levels", + description="Calculates the fibonacci retracement levels", ) parser.add_argument( diff --git a/gamestonk_terminal/economy/economy_controller.py b/gamestonk_terminal/economy/economy_controller.py index 9c61a39223f..0927e19e850 100644 --- a/gamestonk_terminal/economy/economy_controller.py +++ b/gamestonk_terminal/economy/economy_controller.py @@ -25,6 +25,7 @@ from gamestonk_terminal.helper_funcs import ( MENU_QUIT, MENU_RESET, try_except, + system_clear, ) from gamestonk_terminal.menu import session @@ -153,7 +154,7 @@ FRED: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/etf/etf_controller.py b/gamestonk_terminal/etf/etf_controller.py index ff17e6cd665..8a6ee506a34 100644 --- a/gamestonk_terminal/etf/etf_controller.py +++ b/gamestonk_terminal/etf/etf_controller.py @@ -24,6 +24,7 @@ from gamestonk_terminal.helper_funcs import ( MENU_QUIT, MENU_RESET, try_except, + system_clear, ) from gamestonk_terminal.menu import session @@ -117,7 +118,7 @@ Finance Database: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/forex/behavioural_analysis/ba_controller.py b/gamestonk_terminal/forex/behavioural_analysis/ba_controller.py index 06c8c418e4c..3e0a776be29 100644 --- a/gamestonk_terminal/forex/behavioural_analysis/ba_controller.py +++ b/gamestonk_terminal/forex/behavioural_analysis/ba_controller.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" # pylint:disable=too-many-lines import argparse -import os from typing import List from datetime import datetime import textwrap @@ -18,6 +17,7 @@ from gamestonk_terminal.helper_funcs import ( valid_date, check_positive, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.common.behavioural_analysis import ( @@ -145,7 +145,7 @@ SentimentInvestor: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/forex/exploratory_data_analysis/eda_controller.py b/gamestonk_terminal/forex/exploratory_data_analysis/eda_controller.py index 15e37c30bd7..0af6ef69581 100644 --- a/gamestonk_terminal/forex/exploratory_data_analysis/eda_controller.py +++ b/gamestonk_terminal/forex/exploratory_data_analysis/eda_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List from datetime import datetime import pandas as pd @@ -10,7 +9,7 @@ from matplotlib import pyplot as plt from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal.common.exploratory_data_analysis import eda_api from gamestonk_terminal import feature_flags as gtff -from gamestonk_terminal.helper_funcs import get_flair +from gamestonk_terminal.helper_funcs import get_flair, system_clear from gamestonk_terminal.menu import session @@ -111,7 +110,7 @@ class EdaController: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/forex/forex_controller.py b/gamestonk_terminal/forex/forex_controller.py index 707d8fa65fc..34792c00e11 100644 --- a/gamestonk_terminal/forex/forex_controller.py +++ b/gamestonk_terminal/forex/forex_controller.py @@ -1,5 +1,4 @@ import argparse -import os from datetime import timedelta, datetime from typing import List @@ -14,6 +13,7 @@ from gamestonk_terminal.forex import av_view, av_model # from gamestonk_terminal.forex.exploratory_data_analysis import eda_controller from gamestonk_terminal.helper_funcs import ( get_flair, + system_clear, MENU_GO_BACK, MENU_QUIT, MENU_RESET, @@ -106,7 +106,7 @@ Brokerages: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/helper_funcs.py b/gamestonk_terminal/helper_funcs.py index 206dfb7c385..0e5a7bf68e2 100644 --- a/gamestonk_terminal/helper_funcs.py +++ b/gamestonk_terminal/helper_funcs.py @@ -438,7 +438,7 @@ def get_user_agent() -> str: "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:84.0) Gecko/20100101 Firefox/84.0", ] - return random.choice(user_agent_strings) + return random.choice(user_agent_strings) # nosec def text_adjustment_init(self): @@ -563,7 +563,7 @@ def parse_known_args_and_warn( ) if gtff.USE_CLEAR_AFTER_CMD: - os.system("cls||clear") + system_clear() (ns_parser, l_unknown_args) = parser.parse_known_args(other_args) @@ -786,3 +786,8 @@ def try_except(f): print(e, "\n") return inner + + +def system_clear(): + """Clear screen""" + os.system("cls||clear") # nosec diff --git a/gamestonk_terminal/options/options_controller.py b/gamestonk_terminal/options/options_controller.py index 224b4a9340f..51e83ee99df 100644 --- a/gamestonk_terminal/options/options_controller.py +++ b/gamestonk_terminal/options/options_controller.py @@ -24,6 +24,7 @@ from gamestonk_terminal.helper_funcs import ( MENU_RESET, try_except, valid_date, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.options import ( @@ -181,7 +182,7 @@ Current Expiry: {self.selected_date or None} # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( @@ -432,7 +433,7 @@ Current Expiry: {self.selected_date or None} add_help=False, formatter_class=argparse.ArgumentDefaultsHelpFormatter, prog="scr", - description="""Sreener filter output from https://ops.syncretism.io/index.html. + description="""Screener filter output from https://ops.syncretism.io/index.html. Where: CS: Contract Symbol; S: Symbol, T: Option Type; Str: Strike; Exp v: Expiration; IV: Implied Volatility; LP: Last Price; B: Bid; A: Ask; V: Volume; OI: Open Interest; Y: Yield; MY: Monthly Yield; SMP: Regular Market Price; SMDL: Regular Market Day Low; diff --git a/gamestonk_terminal/options/payoff_controller.py b/gamestonk_terminal/options/payoff_controller.py index 808cc1232cb..74032371d1c 100644 --- a/gamestonk_terminal/options/payoff_controller.py +++ b/gamestonk_terminal/options/payoff_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List, Dict import matplotlib.pyplot as plt @@ -13,6 +12,7 @@ from gamestonk_terminal.helper_funcs import ( get_flair, parse_known_args_and_warn, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.options.yfinance_model import get_option_chain, get_price @@ -106,7 +106,7 @@ Underlying Asset: {text} # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/portfolio/brokers/ally/ally_controller.py b/gamestonk_terminal/portfolio/brokers/ally/ally_controller.py index 63ea18ffeee..2244ae69fda 100644 --- a/gamestonk_terminal/portfolio/brokers/ally/ally_controller.py +++ b/gamestonk_terminal/portfolio/brokers/ally/ally_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal import feature_flags as gtff @@ -12,6 +11,7 @@ from gamestonk_terminal.helper_funcs import ( get_flair, parse_known_args_and_warn, try_except, + system_clear, ) @@ -81,7 +81,7 @@ Stock Information: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/portfolio/brokers/bro_controller.py b/gamestonk_terminal/portfolio/brokers/bro_controller.py index 4316e4cf3ad..0e1471be253 100644 --- a/gamestonk_terminal/portfolio/brokers/bro_controller.py +++ b/gamestonk_terminal/portfolio/brokers/bro_controller.py @@ -3,11 +3,10 @@ __docformat__ = "numpy" # pylint: disable=R1710 import argparse -import os from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal import feature_flags as gtff -from gamestonk_terminal.helper_funcs import get_flair +from gamestonk_terminal.helper_funcs import get_flair, system_clear from gamestonk_terminal.menu import session from gamestonk_terminal.portfolio.brokers.ally import ally_controller @@ -77,7 +76,7 @@ Crypto Brokers: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/portfolio/brokers/coinbase/coinbase_controller.py b/gamestonk_terminal/portfolio/brokers/coinbase/coinbase_controller.py index 9c1174ef29a..9782440ab81 100644 --- a/gamestonk_terminal/portfolio/brokers/coinbase/coinbase_controller.py +++ b/gamestonk_terminal/portfolio/brokers/coinbase/coinbase_controller.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" # pylint: disable=R0904, C0302, W0622 import argparse -import os from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal import feature_flags as gtff from gamestonk_terminal.menu import session @@ -15,6 +14,7 @@ from gamestonk_terminal.helper_funcs import ( parse_known_args_and_warn, check_positive, try_except, + system_clear, ) @@ -79,7 +79,7 @@ Coinbase: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/portfolio/brokers/degiro/degiro_controller.py b/gamestonk_terminal/portfolio/brokers/degiro/degiro_controller.py index 5ada9abebd0..453f3be7769 100644 --- a/gamestonk_terminal/portfolio/brokers/degiro/degiro_controller.py +++ b/gamestonk_terminal/portfolio/brokers/degiro/degiro_controller.py @@ -1,6 +1,5 @@ # IMPORTATION STANDARD import argparse -import os # IMPORTATION THIRDPARTY from prompt_toolkit.completion import NestedCompleter @@ -12,6 +11,7 @@ from gamestonk_terminal import feature_flags as gtff from gamestonk_terminal.helper_funcs import ( get_flair, parse_known_args_and_warn, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.portfolio.brokers.degiro.degiro_view import DegiroView @@ -360,7 +360,7 @@ class DegiroController: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/portfolio/brokers/robinhood/robinhood_controller.py b/gamestonk_terminal/portfolio/brokers/robinhood/robinhood_controller.py index 2cb517a3ef9..770846627fd 100644 --- a/gamestonk_terminal/portfolio/brokers/robinhood/robinhood_controller.py +++ b/gamestonk_terminal/portfolio/brokers/robinhood/robinhood_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal import feature_flags as gtff @@ -15,6 +14,7 @@ from gamestonk_terminal.helper_funcs import ( get_flair, parse_known_args_and_warn, try_except, + system_clear, ) valid_span = ["day", "week", "month", "3month", "year", "5year", "all"] @@ -81,7 +81,7 @@ Robinhood: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/portfolio/portfolio_analysis/pa_controller.py b/gamestonk_terminal/portfolio/portfolio_analysis/pa_controller.py index e4583c30015..732781744fa 100644 --- a/gamestonk_terminal/portfolio/portfolio_analysis/pa_controller.py +++ b/gamestonk_terminal/portfolio/portfolio_analysis/pa_controller.py @@ -1,4 +1,4 @@ -"""Portffolio Analysis Controller""" +"""Portfolio Analysis Controller""" __docformat__ = "numpy" import argparse @@ -12,6 +12,7 @@ from gamestonk_terminal.helper_funcs import ( get_flair, parse_known_args_and_warn, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.portfolio.portfolio_analysis import ( @@ -96,7 +97,7 @@ Portfolio: {self.portfolio_name or None} # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/portfolio/portfolio_controller.py b/gamestonk_terminal/portfolio/portfolio_controller.py index 57456be4942..010fe3d4ba8 100644 --- a/gamestonk_terminal/portfolio/portfolio_controller.py +++ b/gamestonk_terminal/portfolio/portfolio_controller.py @@ -20,6 +20,7 @@ from gamestonk_terminal.helper_funcs import ( try_except, valid_date, check_positive_float, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.portfolio.brokers import bro_controller @@ -142,7 +143,7 @@ Graphs: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/portfolio/portfolio_optimization/po_controller.py b/gamestonk_terminal/portfolio/portfolio_optimization/po_controller.py index fad8b839864..8f9069640de 100644 --- a/gamestonk_terminal/portfolio/portfolio_optimization/po_controller.py +++ b/gamestonk_terminal/portfolio/portfolio_optimization/po_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List import matplotlib.pyplot as plt from prompt_toolkit.completion import NestedCompleter @@ -12,6 +11,7 @@ from gamestonk_terminal.helper_funcs import ( parse_known_args_and_warn, check_non_negative, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.portfolio.portfolio_optimization import ( @@ -125,7 +125,7 @@ Mean Variance Optimization: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/reports/reports_controller.py b/gamestonk_terminal/reports/reports_controller.py index a92271376d3..15de7c6b201 100644 --- a/gamestonk_terminal/reports/reports_controller.py +++ b/gamestonk_terminal/reports/reports_controller.py @@ -14,7 +14,7 @@ import papermill as pm from gamestonk_terminal import feature_flags as gtff from gamestonk_terminal.menu import session -from gamestonk_terminal.helper_funcs import get_flair +from gamestonk_terminal.helper_funcs import get_flair, system_clear from gamestonk_terminal import config_terminal @@ -133,7 +133,7 @@ Select one of the following reports: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None # Go back to menu above diff --git a/gamestonk_terminal/resources/resources_controller.py b/gamestonk_terminal/resources/resources_controller.py index 1073ae11e24..5f956c61618 100644 --- a/gamestonk_terminal/resources/resources_controller.py +++ b/gamestonk_terminal/resources/resources_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os import webbrowser from prompt_toolkit.completion import NestedCompleter @@ -10,6 +9,7 @@ from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal import feature_flags as gtff from gamestonk_terminal.helper_funcs import ( get_flair, + system_clear, MENU_GO_BACK, MENU_QUIT, MENU_RESET, @@ -98,7 +98,7 @@ What do you want to do? # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None if other_args: diff --git a/gamestonk_terminal/stocks/backtesting/bt_controller.py b/gamestonk_terminal/stocks/backtesting/bt_controller.py index b9bd926ff1d..01ce51713d1 100644 --- a/gamestonk_terminal/stocks/backtesting/bt_controller.py +++ b/gamestonk_terminal/stocks/backtesting/bt_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List import matplotlib as mpl @@ -16,6 +15,7 @@ from gamestonk_terminal.helper_funcs import ( get_flair, parse_known_args_and_warn, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.stocks.stocks_helper import load @@ -90,7 +90,7 @@ Current Ticker: {self.ticker.upper()} # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/behavioural_analysis/ba_controller.py b/gamestonk_terminal/stocks/behavioural_analysis/ba_controller.py index f06d7400ad8..a1ebb2c8cb9 100644 --- a/gamestonk_terminal/stocks/behavioural_analysis/ba_controller.py +++ b/gamestonk_terminal/stocks/behavioural_analysis/ba_controller.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" # pylint:disable=too-many-lines import argparse -import os from typing import List from datetime import datetime import textwrap @@ -20,6 +19,7 @@ from gamestonk_terminal.helper_funcs import ( valid_date, check_positive, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.common.behavioural_analysis import ( @@ -147,7 +147,7 @@ SentimentInvestor: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/comparison_analysis/ca_controller.py b/gamestonk_terminal/stocks/comparison_analysis/ca_controller.py index 6effd078038..9ee7f8f8132 100644 --- a/gamestonk_terminal/stocks/comparison_analysis/ca_controller.py +++ b/gamestonk_terminal/stocks/comparison_analysis/ca_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" # pylint:disable=too-many-lines import argparse -import os import random from typing import List @@ -17,6 +16,7 @@ from gamestonk_terminal.helper_funcs import ( get_flair, parse_known_args_and_warn, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.portfolio.portfolio_optimization import po_controller @@ -382,7 +382,7 @@ Finviz: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/dark_pool_shorts/dps_controller.py b/gamestonk_terminal/stocks/dark_pool_shorts/dps_controller.py index cb0b7e6f7c4..7193ffd28f8 100644 --- a/gamestonk_terminal/stocks/dark_pool_shorts/dps_controller.py +++ b/gamestonk_terminal/stocks/dark_pool_shorts/dps_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List from datetime import datetime, timedelta from colorama import Style @@ -18,6 +17,7 @@ from gamestonk_terminal.helper_funcs import ( valid_date, check_int_range, try_except, + system_clear, ) from gamestonk_terminal.stocks.stocks_helper import load from gamestonk_terminal.stocks.dark_pool_shorts import ( @@ -129,7 +129,7 @@ Quandl/Stockgrid: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/discovery/disc_controller.py b/gamestonk_terminal/stocks/discovery/disc_controller.py index a1af4de863c..e3f869420f6 100644 --- a/gamestonk_terminal/stocks/discovery/disc_controller.py +++ b/gamestonk_terminal/stocks/discovery/disc_controller.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" # pylint:disable=too-many-lines import argparse -import os from datetime import datetime from typing import List @@ -19,6 +18,7 @@ from gamestonk_terminal.helper_funcs import ( valid_date, check_int_range, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.stocks.discovery import ( @@ -138,7 +138,7 @@ Finance Database: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/due_diligence/dd_controller.py b/gamestonk_terminal/stocks/due_diligence/dd_controller.py index d6bb6fa881d..9378a4d0cc1 100644 --- a/gamestonk_terminal/stocks/due_diligence/dd_controller.py +++ b/gamestonk_terminal/stocks/due_diligence/dd_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List from pandas.core.frame import DataFrame from prompt_toolkit.completion import NestedCompleter @@ -23,6 +22,7 @@ from gamestonk_terminal.helper_funcs import ( check_positive, EXPORT_ONLY_RAW_DATA_ALLOWED, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.stocks.stocks_helper import load @@ -137,7 +137,7 @@ cathiesark.com # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/fundamental_analysis/fa_controller.py b/gamestonk_terminal/stocks/fundamental_analysis/fa_controller.py index 18df7862f59..cb13c9cb5c6 100644 --- a/gamestonk_terminal/stocks/fundamental_analysis/fa_controller.py +++ b/gamestonk_terminal/stocks/fundamental_analysis/fa_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List from prompt_toolkit.completion import NestedCompleter @@ -26,6 +25,7 @@ from gamestonk_terminal.helper_funcs import ( parse_known_args_and_warn, check_positive, try_except, + system_clear, ) from gamestonk_terminal.menu import session @@ -178,7 +178,7 @@ Other Sources: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/fundamental_analysis/financial_modeling_prep/fmp_controller.py b/gamestonk_terminal/stocks/fundamental_analysis/financial_modeling_prep/fmp_controller.py index f2c95355196..bb9317f0a72 100644 --- a/gamestonk_terminal/stocks/fundamental_analysis/financial_modeling_prep/fmp_controller.py +++ b/gamestonk_terminal/stocks/fundamental_analysis/financial_modeling_prep/fmp_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List from prompt_toolkit.completion import NestedCompleter @@ -16,6 +15,7 @@ from gamestonk_terminal.helper_funcs import ( check_positive, EXPORT_ONLY_RAW_DATA_ALLOWED, try_except, + system_clear, ) from gamestonk_terminal.menu import session @@ -115,7 +115,7 @@ Financial Modeling Prep: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/government/gov_controller.py b/gamestonk_terminal/stocks/government/gov_controller.py index cf69bcdf056..74d161c1ac3 100644 --- a/gamestonk_terminal/stocks/government/gov_controller.py +++ b/gamestonk_terminal/stocks/government/gov_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List from colorama import Style from matplotlib import pyplot as plt @@ -16,6 +15,7 @@ from gamestonk_terminal.helper_funcs import ( parse_known_args_and_warn, check_positive, try_except, + system_clear, ) from gamestonk_terminal.stocks.stocks_helper import load from gamestonk_terminal.helper_funcs import ( @@ -113,7 +113,7 @@ Current Ticker: {self.ticker or None}{dim_no_ticker} # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/insider/insider_controller.py b/gamestonk_terminal/stocks/insider/insider_controller.py index 871fe4077f4..d37b5baef75 100644 --- a/gamestonk_terminal/stocks/insider/insider_controller.py +++ b/gamestonk_terminal/stocks/insider/insider_controller.py @@ -13,6 +13,7 @@ from gamestonk_terminal.helper_funcs import ( parse_known_args_and_warn, check_positive, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal import feature_flags as gtff @@ -292,7 +293,7 @@ Ticker: {self.ticker} # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/prediction_techniques/pred_controller.py b/gamestonk_terminal/stocks/prediction_techniques/pred_controller.py index 459483f4bec..59d784333b0 100644 --- a/gamestonk_terminal/stocks/prediction_techniques/pred_controller.py +++ b/gamestonk_terminal/stocks/prediction_techniques/pred_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List from datetime import datetime import pandas as pd @@ -19,6 +18,7 @@ from gamestonk_terminal.helper_funcs import ( get_next_stock_market_days, EXPORT_ONLY_FIGURES_ALLOWED, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.common.prediction_techniques import ( @@ -137,7 +137,7 @@ Models: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/quantitative_analysis/qa_controller.py b/gamestonk_terminal/stocks/quantitative_analysis/qa_controller.py index bbcd79aa6a7..b2cbea925f8 100644 --- a/gamestonk_terminal/stocks/quantitative_analysis/qa_controller.py +++ b/gamestonk_terminal/stocks/quantitative_analysis/qa_controller.py @@ -2,7 +2,6 @@ __docformat__ = "numpy" import argparse -import os from typing import List from datetime import datetime @@ -24,6 +23,7 @@ from gamestonk_terminal.helper_funcs import ( check_proportion_range, parse_known_args_and_warn, try_except, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.stocks.quantitative_analysis.factors_view import capm_view @@ -152,7 +152,7 @@ Other: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/research/res_controller.py b/gamestonk_terminal/stocks/research/res_controller.py index ba14560b7b0..c64f3a61831 100644 --- a/gamestonk_terminal/stocks/research/res_controller.py +++ b/gamestonk_terminal/stocks/research/res_controller.py @@ -2,12 +2,11 @@ __docformat__ = "numpy" import argparse -import os import webbrowser from datetime import datetime from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal import feature_flags as gtff -from gamestonk_terminal.helper_funcs import get_flair +from gamestonk_terminal.helper_funcs import get_flair, system_clear from gamestonk_terminal.menu import session @@ -113,7 +112,7 @@ class ResearchController: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None if other_args: diff --git a/gamestonk_terminal/stocks/screener/screener_controller.py b/gamestonk_terminal/stocks/screener/screener_controller.py index a748b8182f3..e772f1ed48e 100644 --- a/gamestonk_terminal/stocks/screener/screener_controller.py +++ b/gamestonk_terminal/stocks/screener/screener_controller.py @@ -12,6 +12,7 @@ from gamestonk_terminal import feature_flags as gtff from gamestonk_terminal.helper_funcs import ( get_flair, parse_known_args_and_warn, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.portfolio.portfolio_optimization import po_controller @@ -221,7 +222,7 @@ class ScreenerController: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/stocks_controller.py b/gamestonk_terminal/stocks/stocks_controller.py index b30f0c15522..abc23d4eee5 100644 --- a/gamestonk_terminal/stocks/stocks_controller.py +++ b/gamestonk_terminal/stocks/stocks_controller.py @@ -1,5 +1,4 @@ import argparse -import os from typing import List from datetime import datetime, timedelta @@ -25,6 +24,7 @@ from gamestonk_terminal.helper_funcs import ( MENU_QUIT, MENU_RESET, try_except, + system_clear, ) from gamestonk_terminal.common.quantitative_analysis import qa_view @@ -163,7 +163,7 @@ Market {('CLOSED', 'OPEN')[b_is_stock_market_open()]} # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/stocks/technical_analysis/ta_controller.py b/gamestonk_terminal/stocks/technical_analysis/ta_controller.py index 8cb2f701965..54f6d073aed 100644 --- a/gamestonk_terminal/stocks/technical_analysis/ta_controller.py +++ b/gamestonk_terminal/stocks/technical_analysis/ta_controller.py @@ -4,7 +4,6 @@ __docformat__ = "numpy" # pylint:disable=R0904 import argparse -import os from typing import List from datetime import datetime @@ -20,6 +19,7 @@ from gamestonk_terminal.helper_funcs import ( check_positive, try_except, valid_date, + system_clear, ) from gamestonk_terminal.menu import session from gamestonk_terminal.stocks.technical_analysis import ( @@ -169,7 +169,7 @@ Custom: # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr( diff --git a/gamestonk_terminal/terminal_helper.py b/gamestonk_terminal/terminal_helper.py index 35b236bd0d2..a8fe63d383b 100644 --- a/gamestonk_terminal/terminal_helper.py +++ b/gamestonk_terminal/terminal_helper.py @@ -3,7 +3,7 @@ __docformat__ = "numpy" import hashlib import os import random -import subprocess +import subprocess # nosec import sys from datetime import datetime @@ -291,7 +291,7 @@ def print_goodbye(): else: goodbye_msg_time = "Go get some rest soldier!" - print( + print( # nosec goodbye_msg[random.randint(0, len(goodbye_msg) - 1)] + goodbye_msg_time + "\n" ) @@ -310,7 +310,7 @@ def update_terminal(): """Updates the terminal by running git pull in the directory. Runs poetry install if needed""" poetry_hash = sha256sum("poetry.lock") - completed_process = subprocess.run("git pull", shell=True, check=False) + completed_process = subprocess.run("git pull", shell=True, check=False) # nosec if completed_process.returncode != 0: return completed_process.returncode @@ -323,7 +323,9 @@ def update_terminal(): "Seems like more modules have been added, grab a coke, this may take a while." ) - completed_process = subprocess.run("poetry install", shell=True, check=False) + completed_process = subprocess.run( + "poetry install", shell=True, check=False + ) # nosec if completed_process.returncode != 0: return completed_process.returncode @@ -358,7 +360,7 @@ def about_us(): def bootup(): # Enable VT100 Escape Sequence for WINDOWS 10 Ver. 1607 if sys.platform == "win32": - os.system("") + os.system("") # nosec try: if os.name == "nt": @@ -390,7 +392,7 @@ def reset(menu_prior_to_reset=""): plt.close("all") arg = f" {menu_prior_to_reset}" if menu_prior_to_reset else "" - completed_process = subprocess.run( + completed_process = subprocess.run( # nosec f"{sys.executable} terminal.py{arg}", shell=True, check=False ) if completed_process.returncode != 0: diff --git a/terminal.py b/terminal.py index b06cf0604b2..38375a3298c 100644 --- a/terminal.py +++ b/terminal.py @@ -3,7 +3,6 @@ __docformat__ = "numpy" import argparse -import os import sys from prompt_toolkit.completion import NestedCompleter @@ -12,6 +11,7 @@ from gamestonk_terminal import config_terminal from gamestonk_terminal import feature_flags as gtff from gamestonk_terminal.helper_funcs import ( get_flair, + system_clear, MENU_RESET, MENU_GO_BACK, MENU_QUIT, @@ -125,7 +125,7 @@ What do you want to do? # Clear screen if known_args.cmd == "cls": - os.system("cls||clear") + system_clear() return None return getattr(