diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2020-09-11 15:28:38 -0400 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2020-09-11 15:28:38 -0400 |
commit | cd5b93e030529f3b2811a68669b7fe8312aa5a65 (patch) | |
tree | 24be6848e97611fc7938dc40376afc5cf9a40f7a | |
parent | 81fb6f3e78d16723f510f21eda0e15c97b1c9916 (diff) | |
parent | f645639004ecf2b1de93c8ed237ef6bd19fd3dd9 (diff) |
Merge branch '2.7' into master
-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 3a07426f..a54d502d 100644 --- a/paramiko/pkey.py +++ b/paramiko/pkey.py @@ -652,7 +652,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." |