From ba35b3ba85c374dfd0659992cae01255c530679d Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 10 May 2015 13:07:59 -0500
Subject: remove policyqualifierinfo object

---
 src/cryptography/x509.py | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index eb7731fc..b559ae03 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -489,11 +489,13 @@ class PolicyInformation(object):
 
         self._policy_identifier = policy_identifier
         if policy_qualifiers and not all(
-            isinstance(x, PolicyQualifierInfo) for x in policy_qualifiers
+            isinstance(
+                x, (six.text_type, UserNotice)
+            ) for x in policy_qualifiers
         ):
             raise TypeError(
-                "policy_qualifiers must be a list of PolicyQualifierInfo "
-                "objects or None"
+                "policy_qualifiers must be a list of strings and/or UserNotice"
+                " objects or None"
             )
 
         self._policy_qualifiers = policy_qualifiers
@@ -508,28 +510,6 @@ class PolicyInformation(object):
     policy_qualifiers = utils.read_only_property("_policy_qualifiers")
 
 
-class PolicyQualifierInfo(object):
-    def __init__(self, qualifier):
-        if not isinstance(qualifier, (six.string_types, UserNotice)):
-            raise ValueError("qualifier must be string or UserNotice")
-
-        if isinstance(qualifier, six.string_types):
-            self._policy_qualifier_id = OID_CPS_QUALIFIER
-        else:
-            self._policy_qualifier_id = OID_CPS_USER_NOTICE
-
-        self._qualifier = qualifier
-
-    def __repr__(self):
-        return (
-            "<PolicyQualifierInfo(policy_qualifier_id={0.policy_qualifier_id}"
-            ", qualifier={0.qualifier})>".format(self)
-        )
-
-    policy_qualifier_id = utils.read_only_property("_policy_qualifier_id")
-    qualifier = utils.read_only_property("_qualifier")
-
-
 class UserNotice(object):
     def __init__(self, notice_reference, explicit_text):
         if notice_reference and not isinstance(
-- 
cgit v1.2.3