From 31e398802c79d3b4a182b28f17b99595e84bbe2a Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Wed, 11 Mar 2015 11:37:04 -0500
Subject: rename request to CSR

---
 src/cryptography/hazmat/backends/interfaces.py      | 4 ++--
 src/cryptography/hazmat/backends/multibackend.py    | 4 ++--
 src/cryptography/hazmat/backends/openssl/backend.py | 6 +++---
 src/cryptography/hazmat/backends/openssl/x509.py    | 4 ++--
 src/cryptography/x509.py                            | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/cryptography/hazmat/backends/interfaces.py b/src/cryptography/hazmat/backends/interfaces.py
index 44a3d81d..354b5141 100644
--- a/src/cryptography/hazmat/backends/interfaces.py
+++ b/src/cryptography/hazmat/backends/interfaces.py
@@ -263,7 +263,7 @@ class X509Backend(object):
         """
 
     @abc.abstractmethod
-    def load_pem_x509_request(self, data):
+    def load_pem_x509_csr(self, data):
         """
-        Load an X.509 request from PEM encoded data.
+        Load an X.509 CSR from PEM encoded data.
         """
diff --git a/src/cryptography/hazmat/backends/multibackend.py b/src/cryptography/hazmat/backends/multibackend.py
index b09484ca..86ddc3b1 100644
--- a/src/cryptography/hazmat/backends/multibackend.py
+++ b/src/cryptography/hazmat/backends/multibackend.py
@@ -325,11 +325,11 @@ class MultiBackend(object):
             _Reasons.UNSUPPORTED_X509
         )
 
-    def load_pem_x509_request(self, data):
+    def load_pem_x509_csr(self, data):
         for b in self._filtered_backends(
             X509Backend
         ):
-            return b.load_pem_x509_request(data)
+            return b.load_pem_x509_csr(data)
 
         raise UnsupportedAlgorithm(
             "This backend does not support X.509.",
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py
index 5dfc31c2..48fdcb72 100644
--- a/src/cryptography/hazmat/backends/openssl/backend.py
+++ b/src/cryptography/hazmat/backends/openssl/backend.py
@@ -34,7 +34,7 @@ from cryptography.hazmat.backends.openssl.hmac import _HMACContext
 from cryptography.hazmat.backends.openssl.rsa import (
     _RSAPrivateKey, _RSAPublicKey
 )
-from cryptography.hazmat.backends.openssl.x509 import _Certificate, _Request
+from cryptography.hazmat.backends.openssl.x509 import _CSR, _Certificate
 from cryptography.hazmat.bindings.openssl.binding import Binding
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import dsa, ec, rsa
@@ -820,7 +820,7 @@ class Backend(object):
         x509 = self._ffi.gc(x509, self._lib.X509_free)
         return _Certificate(self, x509)
 
-    def load_pem_x509_request(self, data):
+    def load_pem_x509_csr(self, data):
         mem_bio = self._bytes_to_bio(data)
         x509_req = self._lib.PEM_read_bio_X509_REQ(
             mem_bio.bio, self._ffi.NULL, self._ffi.NULL, self._ffi.NULL
@@ -830,7 +830,7 @@ class Backend(object):
             raise ValueError("Unable to load request")
 
         x509_req = self._ffi.gc(x509_req, self._lib.X509_REQ_free)
-        return _Request(self, x509_req)
+        return _CSR(self, x509_req)
 
     def _load_key(self, openssl_read_func, convert_func, data, password):
         mem_bio = self._bytes_to_bio(data)
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py
index fb767790..e936201e 100644
--- a/src/cryptography/hazmat/backends/openssl/x509.py
+++ b/src/cryptography/hazmat/backends/openssl/x509.py
@@ -218,8 +218,8 @@ class _Certificate(object):
         return x509.BasicConstraints(ca, path_length)
 
 
-@utils.register_interface(x509.Request)
-class _Request(object):
+@utils.register_interface(x509.CSR)
+class _CSR(object):
     def __init__(self, backend, x509_req):
         self._backend = backend
         self._x509_req = x509_req
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index 7b61e812..d58ca0bb 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -60,8 +60,8 @@ def load_der_x509_certificate(data, backend):
     return backend.load_der_x509_certificate(data)
 
 
-def load_pem_x509_request(data, backend):
-    return backend.load_pem_x509_request(data)
+def load_pem_x509_csr(data, backend):
+    return backend.load_pem_x509_csr(data)
 
 
 class InvalidVersion(Exception):
@@ -343,7 +343,7 @@ class Certificate(object):
 
 
 @six.add_metaclass(abc.ABCMeta)
-class Request(object):
+class CSR(object):
     @abc.abstractmethod
     def public_key(self):
         """
-- 
cgit v1.2.3