diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2020-09-11 15:29:07 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2020-09-11 15:29:07 -0400 |
| commit | 670b7b90b726d25a338a9367f35cd55a9fed1eae (patch) | |
| tree | d120358fedb23f6491e57d63bca125968db1bd1c | |
| parent | f7c5fb19d9660e4ea1970807cf5ab52ffcec0a68 (diff) | |
| parent | 14c6c8e786fdaae5b143cb81ccd32d21ce4164fc (diff) | |
Merge branch '2.5' into 2.6
| -rw-r--r-- | paramiko/pkey.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/paramiko/pkey.py b/paramiko/pkey.py index e37f7751..e8e65589 100644 --- a/paramiko/pkey.py +++ b/paramiko/pkey.py @@ -460,7 +460,8 @@ class PublicBlob(object): Tries to be as dumb as possible and barely cares about specific per-key-type data. - ..note:: + .. note:: + Most of the time you'll want to call `from_file`, `from_string` or `from_message` for useful instantiation, the main constructor is basically "I should be using ``attrs`` for this." |