diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-02-10 17:22:16 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-02-10 17:22:16 -0500 |
| commit | cd18ac09b20670a6e448d778a684ecffdf01c3c6 (patch) | |
| tree | debc8542d9004686567acc2103274d518f24bb17 /docs/glossary.rst | |
| parent | 7d93ad6f654313f86320153b797e34a5959c42eb (diff) | |
| parent | 4bb464995cae1b1f86d383fb668f9c5276b3d059 (diff) | |
| download | cryptography-cd18ac09b20670a6e448d778a684ecffdf01c3c6.tar.gz cryptography-cd18ac09b20670a6e448d778a684ecffdf01c3c6.tar.bz2 cryptography-cd18ac09b20670a6e448d778a684ecffdf01c3c6.zip | |
Merge pull request #1645 from reaperhulk/x509-attrs
add attribute and objectidentifier classes for x509 name
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index ef422a6e..dc6f3ebf 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -60,3 +60,7 @@ Glossary This is a property of encryption systems whereby two encrypted messages aren't distinguishable without knowing the encryption key. This is considered a basic, necessary property for a working encryption system. + + text + This type corresponds to ``unicode`` on Python 2 and ``str`` on Python + 3. This is equivalent to ``six.text_type``. |