From 80aca35dd13f96751caf6998c8389db9c3334f52 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 13 Oct 2015 15:00:59 +0200 Subject: [PATCH] Removing #1450 --- lib/core/settings.py | 49 -------------------------------------------- lib/parse/cmdline.py | 6 ------ 2 files changed, 55 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 3b53705ba..4ded4236a 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -682,52 +682,3 @@ th{ font-size:10px; } """ - -NNC5ED_LOGO = """ -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -MMWWMMMWWMMMWWMMMMWWMMMMWWMMMWWMMMMMWMMMWWWMMMMMMMWWMMMWWMWMWWWWMMMWWWMMMWMWWWMMMMMWWMMMMM -MMNNNMMNNMMWXNNMMMWNWMMWNWMMNNNWMMMNNWMWNNNMMMMMMWNNWMMNNWNWWWWWMNNWWNNNWNNWWWNWMMNNNNMMMM -MMWWWNWNXMMNNWNNMMMNNMWNWMMWXWNXWMMNXWMNNWNNMMMMMWNWNNWXNWNWWNWWNNWMMMWWWNNWWNNWMWXWNXWMMM -MMNNMWNNNMNNNNNXWMMMNNNNMMWNNNNXNMMNNWWNNNNXWMMMMWXWMNNNNWNWMMMMWNWMWWNNWNNWWWWMWNNNNXNMMM -MMNNMMWNNWNWMMMNNWMMWWNMMMNNMMMWNNWNWWNNMMMNNWMMMWNWMMNNWWNWWNNWMWNWWNNWMWWMMMWWNNWMMWNNMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMMMNXXXXXXXXXXXXXXNMMMMMMMMMMMMMMMMMMWXXXXXXXXXXXXXXNMMMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMM00:,'',,;'...';cld0XXWMMMMMMMMWXXKxlc;'...';,,'',:O0MMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMNK,       .,;:.     .:kKXXXXXXKkc.     .:;,.       .XXMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMM0W            ;d.      'c;,,;:,      .d;            N0MMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMM0W              K;                  'K.         .odoX0MMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMM0W            :l.          '         .cc        OOX00MMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMKX.         ':             .;           ;,       :lcN0MMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMM0l        ;.               l             ;        ;0WMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMM0X       .                 l              .       O0MMMMMMMMMMMMMMMMMM -MMMMMMMMMMMWXXXXXMMMW0d                        :                     cKNMMMXXXXXXWMMMMMMMM -MMMMMMMMMMXKl. .dKNMMNKo      .'::             '          ;:,.      lKXMMN0d.  .:KKMMMMMMM -MMMMMMMMMM0:     dxkO0OKK;  ,KMMMN    ,ko.     .   lO:    0MMMXc  ,0X00OOxO      ;KXMMMMMM -MMMMMMMMMKX.             :  kMMMMM.  oMMMWo      cWMMMO   WMMMMK  c               :0WMMMMM -MMMMMMMMM0K             .'   kMMMMx .MMMMMM0    kMMMMMM: lMMMM0.  .'              ;0WMMMMM -MMMMMMMMMXK:   ;0XXXXXXKN.    'kWMMl:MMMMMMMd  cMMMMMMMo;MMMO,     XKXXXXXXXOo,.,o0XMMMMMM -MMMMMMMMMMNXX0XXNMMMMMMM0O       ,ldlkO0OOxl.   cxOO0OOodl,       k0WMMMMMMMMXXXXXMMMMMMMM -MMMMMMMMMMMMMMMMMMMMMMMMWO0                                      k0KWMMMMMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMNKOooxKXXXXkoc,,.                ..                .;.,ldOXXXNMNXXXWMMMMMMMMMM -MMMMMMMMMMMWOd     :;.      .c.            oNMMWx            .o,       .;ldd:;ckKNMMMMMMMM -MMMMMMMMMMMW0:           .:d0XXOl'        'WKMMKN;        'lkXXXOo;.            l0WMMMMMMM -MMMMMMMMMMMMOx       .:d0XXWMMXXk0OO:.       0X.      .,kO0OKXMMMNXXOo;         .KXMMMMMMM -MMMMMMMMMMMM0o      ;XXNMMMMWK00kNOk0Xkx,          'dxKKkONkO0KNMMMMMNKN.       O0MMMMMMMM -MMMMMMMMMMMMXKd.  .lKXMMMMMMO0Kk0xKxXkKXX0Oo,..,lkOXX000xKxKkKO0WMMMMMM00.     d0MMMMMMMMM -MMMMMMMMMMMMMMXXXXXXWMMMMMM0W000WO00XK0NKk;;cll:,,xKN0N0000X0OKX0MMMMMMMXXxlloOKWMMMMMMMMM -MMMMMMMMMMMMMMMMMMMMMMMMMMM0WX0NK0KXKX00l;NdlollXN.x0KXKXK0KX0WX0MMMMMMMMMMNXNMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMWXXNMNXXNMN0d ;,.ccc;.c'.k0MMWKXXMWXXNMMMMMMMMMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM0N  kKKKOOKKK: 'KXMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM0N  WMMlNKOMMx 'KXMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM0N  WMMdX0OMMx 'KXMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM0N  k00000000: 'KXMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMN0d::::::::::::k0MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -MMMMMMMW00OOXMMMMMMMMMMMMMMMMMMMMMMMMMMXXXXXXXXXXXXXNMMMMMMMMMMN00O0WMMMMMMMMMMMMMMMMMMMMM -MMMMMMd;KMMK,:XMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMKlKMMMMMMMMMMXclNMWd,dMMMMMMMMMMMMMMMMMMMM -MMMMMO';NMMMxo0No:lccOM0oxdc:lNWd::;:xWNdk00loNl,';:NOc::;:kM:'oMMMXodW0c:l:oXMdokl:ckMMMM -MMMMMk''KMMNdxKo';WN''kk'dXK,'0o',dc''kl'0MMKkXK''KNMklldc',W;':MMM0xxX''xMx',W:,0Xd';MMMM -MMMMMWl,WMMW';XO,,K0',0k'dMN''K0cckx',Kk'0MMo,K0''kcd''ck,',WK;oMMMk'dWc'oXo':W:'XMx':MMMM -MMMMMMMXOO0KKWMMNOxxONMXOXMWkxNMKkxxONMMX0KK0NMM0xxOW0xxO0kOWMMKOO00NMMMKkxkKMMOOWMXxOMMMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM - -""" \ No newline at end of file diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py index 5c0dc16d7..68bad2f3f 100644 --- a/lib/parse/cmdline.py +++ b/lib/parse/cmdline.py @@ -17,7 +17,6 @@ from optparse import SUPPRESS_HELP from lib.core.common import checkDeprecatedOptions from lib.core.common import checkSystemEncoding -from lib.core.common import dataToStdout from lib.core.common import expandMnemonics from lib.core.common import getUnicode from lib.core.data import cmdLineOptions @@ -31,7 +30,6 @@ from lib.core.settings import BASIC_HELP_ITEMS from lib.core.settings import DUMMY_URL from lib.core.settings import IS_WIN from lib.core.settings import MAX_HELP_OPTION_LENGTH -from lib.core.settings import NNC5ED_LOGO from lib.core.settings import VERSION_STRING from lib.core.shell import autoCompletion from lib.core.shell import clearHistory @@ -930,10 +928,6 @@ def cmdLineParser(argv=None): if argv[i] == "-z": expandMnemonics(argv[i + 1], parser, args) - if args.nnc5ed: - dataToStdout(NNC5ED_LOGO) - raise SystemExit - if args.dummy: args.url = args.url or DUMMY_URL