Refactor copyright banner

sebastinas · sebastinas · commit ff122520bf08 · 2020-10-19T23:32:09.000+02:00
diff --git a/bpdb/__init__.py b/bpdb/__init__.py
@@ -26,6 +26,7 @@
 import traceback
 
 import bpython
+from bpython.args import version_banner, copyright_banner
 from .debugger import BPdb
 from optparse import OptionParser
 from pdb import Restart
@@ -74,12 +75,8 @@ def main():
     )
     options, args = parser.parse_args(sys.argv)
     if options.version:
-        print("bpdb on top of bpython version", __version__, end="")
-        print("on top of Python", sys.version.split()[0])
-        print(
-            "(C) 2008-2013 Bob Farrell, Andreas Stuehrk et al. "
-            "See AUTHORS for detail."
-        )
+        print(version_banner(base="bpdb"))
+        print(copyright_banner())
         return 0
 
     if len(args) < 2:
diff --git a/bpython/args.py b/bpython/args.py
@@ -1,15 +1,37 @@
+# The MIT License
+#
+# Copyright (c) 2008 Bob Farrell
+# Copyright (c) 2012-2020 Sebastian Ramacher
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 """
 Module to handle command line argument parsing, for all front-ends.
 """
 
-
 import code
 import importlib.util
 import os
 import sys
 from optparse import OptionParser, OptionGroup
 
-from . import __version__
+from . import __version__, __copyright__
 from .config import default_config_path, loadini, Struct
 from .translations import _
 
@@ -23,14 +45,19 @@ def error(self, msg):
         raise OptionParserFailed()
 
 
-def version_banner():
-    return "bpython version {} on top of Python {} {}".format(
+def version_banner(base="bpython"):
+    return "{} version {} on top of Python {} {}".format(
+        base,
         __version__,
         sys.version.split()[0],
         sys.executable,
     )
 
 
+def copyright_banner():
+    return "{} See AUTHORS for details.".format(__copyright__)
+
+
 def parse(args, extras=None, ignore_stdin=False):
     """Receive an argument list - if None, use sys.argv - parse all args and
     take appropriate action. Also receive optional extra options: this should
@@ -110,10 +137,7 @@ def parse(args, extras=None, ignore_stdin=False):
 
     if options.version:
         print(version_banner())
-        print(
-            "(C) 2008-2020 Bob Farrell, Andreas Stuehrk, Sebastian Ramacher, Thomas Ballinger, et al. "
-            "See AUTHORS for detail."
-        )
+        print(copyright_banner())
         raise SystemExit
 
     if not ignore_stdin and not (sys.stdin.isatty() and sys.stdout.isatty()):
