commit 246daf7ffe997fbe3c8429e25421125408130bcc
author Paul Kehrer <paul.l.kehrer@gmail.com> Mon Aug 10 21:12:24 2015 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Tue Aug 11 00:06:57 2015 -0500
tree 51b9cc72998f23638971d2ebc448e6b46c8a76df
parent 21bdd1bd1efc87d4b47679a4f30fe2ba39528e06

make import consistent

docs/x509/tutorial.rst

diff --git a/docs/x509/tutorial.rst b/docs/x509/tutorial.rst
index 7f0dda3..5e8d54e 100644
--- a/docs/x509/tutorial.rst
+++ b/docs/x509/tutorial.rst
@@ -57,15 +57,15 @@
 .. code-block:: pycon
 
     >>> from cryptography import x509
-    >>> from cryptography.x509 import oid
+    >>> from cryptography.x509.oid import NameOID
     >>> # Generate a CSR
     >>> csr = x509.CertificateSigningRequestBuilder().subject_name(x509.Name([
     ...     # Provide various details about who we are.
-    ...     x509.NameAttribute(oid.NameOID.COUNTRY_NAME, u"US"),
-    ...     x509.NameAttribute(oid.NameOID.STATE_OR_PROVINCE_NAME, u"CA"),
-    ...     x509.NameAttribute(oid.NameOID.LOCALITY_NAME, u"San Francisco"),
-    ...     x509.NameAttribute(oid.NameOID.ORGANIZATION_NAME, u"My Company"),
-    ...     x509.NameAttribute(oid.NameOID.COMMON_NAME, u"mysite.com"),
+    ...     x509.NameAttribute(NameOID.COUNTRY_NAME, u"US"),
+    ...     x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u"CA"),
+    ...     x509.NameAttribute(NameOID.LOCALITY_NAME, u"San Francisco"),
+    ...     x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"My Company"),
+    ...     x509.NameAttribute(NameOID.COMMON_NAME, u"mysite.com"),
     ... ])).add_extension(x509.SubjectAlternativeName([
     ...     # Describe what sites we want this certificate for.
     ...     x509.DNSName(u"mysite.com"),