Skip to content

add ActiveState branding - #8

Closed
ucodery wants to merge 2 commits into
masterfrom
jeremyp/branding
Closed

ucodery wants to merge 2 commits into
masterfrom
jeremyp/branding

Conversation

@ucodery

@ucodery ucodery commented Mar 4, 2021 •

Copy link
Copy Markdown

This is the affect of these changes in the python REPL:

❯ ./python.exe
Python 3.10.0a0 (heads/branding-dirty:5241e189e7, Mar  4 2021, 15:16:23)
[Clang 12.0.0 (clang-1200.0.32.29)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
15:19:23.73 $ copyright
Copyright (c) 2001-2020 Python Software Foundation.
All Rights Reserved.

Copyright (c) 2000 BeOpen.com.
All Rights Reserved.

Copyright (c) 1995-2001 Corporation for National Research Initiatives.
All Rights Reserved.

Copyright (c) 1991-1995 Stichting Mathematisch Centrum, Amsterdam.
All Rights Reserved.

Binary build provided by ActiveState http://www.ActiveState.com
15:19:28.54 $ credits
    Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
    for supporting Python development.  See www.python.org for more information.
    Binary build provided by ActiveState http://www.ActiveState.com
15:19:34.01 $ license
Type license() to see the full license text
15:19:44.99 $ license()
A. HISTORY OF THE SOFTWARE
==========================

Python was created in the early 1990s by Guido van Rossum at Stichting
Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
as a successor of a language called ABC.  Guido remains Python's
principal author, although it includes many contributions from others.

In 1995, Guido continued his work on Python at the Corporation for
National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
in Reston, Virginia where he released several versions of the
software.

In May 2000, Guido and the Python core development team moved to
BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
year, the PythonLabs team moved to Digital Creations, which became
Zope Corporation.  In 2001, the Python Software Foundation (PSF, see
https://www.python.org/psf/) was formed, a non-profit organization
created specifically to own Python-related Intellectual Property.
Zope Corporation was a sponsoring member of the PSF.

All Python releases are Open Source (see http://www.opensource.org for
the Open Source Definition).  Historically, most, but not all, Python
Hit Return for more, or q (and Return) to quit: q
15:20:51.33 $ help()

Welcome to Python 3.10's help utility!

If this is your first time using Python, you should definitely check out
the tutorial on the Internet at https://docs.python.org/3.10/tutorial/.

Enter the name of any module, keyword, or topic to get help on writing
Python programs and using Python modules.  To quit this help utility and
return to the interpreter, just type "quit".

To get a list of available modules, keywords, symbols, or topics, type
"modules", "keywords", "symbols", or "topics".  Each module also comes
with a one-line summary of what it does; to list the modules whose name
or summary contain a given string such as "spam", type "modules spam".

help> q

You are now leaving help and returning to the Python interpreter.
If you want to ask for help on a particular object directly from the
interpreter, you can type "help(object)".  Executing "help('string')"
has the same effect as typing a particular string at the help> prompt.
15:20:55.07 $ ^D

@ucodery

ucodery commented Mar 4, 2021

Copy link
Copy Markdown
Author

Some other files I think could be considered for branding that were not in the PT story:

  • README.rst
  • Doc/copyright.rst
  • Lib/idlelib/CREDITS.txt
  • Misc/ACKS

Also, I did not update the COPYRIGHT def in main.c as requested in the ticket as it is really just the redirecting statement "Type "help", "copyright", "credits" or "license" for more information." but if we do want to edit it, this string is actually present elsewhere including Lib/idlelib/pyshell.py Lib/asyncio/__main__.py and Lib/code.py.

@ucodery
ucodery requested review from rawktron and shaunmlowry March 4, 2021 23:38
@rawktron

rawktron commented Mar 5, 2021

Copy link
Copy Markdown

Some other files I think could be considered for branding that were not in the PT story:

  • README.rst
  • Doc/copyright.rst
  • Lib/idlelib/CREDITS.txt
  • Misc/ACKS

Also, I did not update the COPYRIGHT def in main.c as requested in the ticket as it is really just the redirecting statement "Type "help", "copyright", "credits" or "license" for more information." but if we do want to edit it, this string is actually present elsewhere including Lib/idlelib/pyshell.py Lib/asyncio/__main__.py and Lib/code.py.

  • If it's easy to patch those text files, then sure we can do that as well
  • What about the REPL banner? I think I thought the copyright string would update that REPL banner. We should add the "Binary build…" text to the REPL banner. If the copyright string is just that redirecting statement, fine to just leave it alone.

@ucodery

ucodery commented Mar 5, 2021

Copy link
Copy Markdown
Author

The copyright you referenced would update the REPL banner, it is currently just that one line string I copied, so REPL with banner vs REPL with no banner

10:02:14jeremyp@ActiveMac:~/git/cpython☁️ us-east-1branding[?]🅰️ pr4688🐍[email protected]
❯ ./python.exe
Python 3.10.0a0 (heads/branding-dirty:5241e189e7, Mar  4 2021, 15:16:23)
[Clang 12.0.0 (clang-1200.0.32.29)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
10:02:16.29 $ ^D
10:02:18jeremyp@ActiveMac:~/git/cpython☁️ us-east-1branding[?]🅰️ pr4688🐍[email protected]
2s❯ ./python.exe -q
10:02:22.47 $ ^D

The copyright I updated here adds a line to the output from calling copyright(). Are you saying we need to brand both the prompt that tells you about copyright and the output of calling copyright?

@rawktron

rawktron commented Mar 5, 2021

Copy link
Copy Markdown

The copyright you referenced would update the REPL banner, it is currently just that one line string I copied, so REPL with banner vs REPL with no banner

10:02:14jeremyp@ActiveMac:~/git/cpython☁️ us-east-1branding[?]🅰️ pr4688🐍[email protected]
❯ ./python.exe
Python 3.10.0a0 (heads/branding-dirty:5241e189e7, Mar  4 2021, 15:16:23)
[Clang 12.0.0 (clang-1200.0.32.29)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
10:02:16.29 $ ^D
10:02:18jeremyp@ActiveMac:~/git/cpython☁️ us-east-1branding[?]🅰️ pr4688🐍[email protected]
2s❯ ./python.exe -q
10:02:22.47 $ ^D

The copyright I updated here adds a line to the output from calling copyright(). Are you saying we need to brand both the prompt that tells you about copyright and the output of calling copyright?

Yeah, right after the "Clang" line, the next line should be Binary build provided by ActiveState etc.

Ok, then yeah, we should update that copyright text everywhere it appears in the code. It should precede the help text then. Basically after the [Clang etc.] line.

@rawktron rawktron left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(See my reply to other comment re: REPL banner and Clang line)

@ucodery

ucodery commented Mar 5, 2021

Copy link
Copy Markdown
Author

Here are the latest changes from within a REPL:

13:05:24jeremyp@ActiveMac:~/git/cpython☁️ us-east-1branding[!?]🅰️ pr4688🐍[email protected]
❯ ./python.exe
Python 3.10.0a0 (heads/branding-dirty:8fde6f6e66, Mar  5 2021, 12:15:47)
[Clang 12.0.0 (clang-1200.0.32.29)] on darwin
Binary build provided by ActiveState http://www.ActiveState.com
Type "help", "copyright", "credits" or "license" for more information.
13:05:29.88 $ copyright
Copyright (c) 2001-2020 Python Software Foundation.
All Rights Reserved.

Copyright (c) 2000 BeOpen.com.
All Rights Reserved.

Copyright (c) 1995-2001 Corporation for National Research Initiatives.
All Rights Reserved.

Copyright (c) 1991-1995 Stichting Mathematisch Centrum, Amsterdam.
All Rights Reserved.

Binary build provided by ActiveState http://www.ActiveState.com
13:05:50.52 $ credits
    Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
    for supporting Python development.  See www.python.org for more information.
    Binary build provided by ActiveState http://www.ActiveState.com
13:06:05.48 $ license()
A. HISTORY OF THE SOFTWARE
==========================

Python was created in the early 1990s by Guido van Rossum at Stichting
Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
as a successor of a language called ABC.  Guido remains Python's
principal author, although it includes many contributions from others.

In 1995, Guido continued his work on Python at the Corporation for
National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
in Reston, Virginia where he released several versions of the
software.

In May 2000, Guido and the Python core development team moved to
BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
year, the PythonLabs team moved to Digital Creations, which became
Zope Corporation.  In 2001, the Python Software Foundation (PSF, see
https://www.python.org/psf/) was formed, a non-profit organization
created specifically to own Python-related Intellectual Property.
Zope Corporation was a sponsoring member of the PSF.

All Python releases are Open Source (see http://www.opensource.org for
the Open Source Definition).  Historically, most, but not all, Python
Hit Return for more, or q (and Return) to quit: q
13:06:30.75 $ help()

Welcome to Python 3.10's help utility!

If this is your first time using Python, you should definitely check out
the tutorial on the Internet at https://docs.python.org/3.10/tutorial/.

Enter the name of any module, keyword, or topic to get help on writing
Python programs and using Python modules.  To quit this help utility and
return to the interpreter, just type "quit".

To get a list of available modules, keywords, symbols, or topics, type
"modules", "keywords", "symbols", or "topics".  Each module also comes
with a one-line summary of what it does; to list the modules whose name
or summary contain a given string such as "spam", type "modules spam".

help> q

You are now leaving help and returning to the Python interpreter.
If you want to ask for help on a particular object directly from the
interpreter, you can type "help(object)".  Executing "help('string')"
has the same effect as typing a particular string at the help> prompt.
13:06:39.67 $ exit()

I also added to README.rst and Doc/copyright.rst as both had another copy of the Python copyright, but decided not to go into Lib/idlelib/CREDITS.txt or Misc/ACKS as both are just a list of names.

@ucodery ucodery closed this Mar 10, 2021
@ucodery

ucodery commented Mar 10, 2021

Copy link
Copy Markdown
Author

Patching code finalized in https://github.com/ActiveState/platform-builders/pull/80

@ucodery
ucodery deleted the jeremyp/branding branch March 10, 2021 04:51
icanhasmath added a commit that referenced this pull request Oct 29, 2026
setuptools 68.0.0.2 still had CVE-2026-59890 (GHSA-h35f-9h28-mq5c,
MANIFEST.in exclusion bypass in sdist) and GHSA-xmj3-9gf7-h52w (path
escape via namespace_packages.txt during legacy wheel installation).
ActiveState setuptools 68.0.0.post3 (ActiveState/setuptools#7, #8) fixes
both. The wheel is the release asset, sha256
95bb21258fbcb75b5d7d3740ce296991641e8c78a0de9590747ba2d11aa81c43.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants