Change c_create_mech_list to c_create_oid_set

The function `c_create_mech_list` in the low-level converters
really just converted a OID set struct into a list of OIDs.
Ergo, it should be named as such.

Additionally, it makes more sense for the return value to be
a set, so make it as such.

Author: DirectXMan12

gssapi/raw/creds.pyx

@@ -2,7 +2,7 @@ GSSAPI="BASE"  # This ensures that a full module is generated by Cython
 
 from gssapi.raw.cython_types cimport *
 from gssapi.raw.cython_converters cimport c_get_mech_oid_set
-from gssapi.raw.cython_converters cimport c_create_mech_list
+from gssapi.raw.cython_converters cimport c_create_oid_set
 from gssapi.raw.cython_converters cimport c_py_ttl_to_c, c_c_ttl_to_py
 from gssapi.raw.names cimport Name
 from gssapi.raw.oids cimport OID
@@ -146,7 +146,7 @@ def acquire_cred(Name name, ttl=None, mechs=None, cred_usage='both'):
     cdef Creds rc = Creds()
     if maj_stat == GSS_S_COMPLETE:
         rc.raw_creds = creds
-        return AcquireCredResult(rc, c_create_mech_list(actual_mechs),
+        return AcquireCredResult(rc, c_create_oid_set(actual_mechs),
                                  c_c_ttl_to_py(actual_ttl))
     else:
         raise GSSError(maj_stat, min_stat)
@@ -241,7 +241,7 @@ def inquire_cred(Creds creds not None, name=True, ttl=True,
 
         py_mechs = None
         if mechs:
-            py_mechs = c_create_mech_list(res_mechs)
+            py_mechs = c_create_oid_set(res_mechs)
 
         return InquireCredResult(rn, py_ttl, py_usage, py_mechs)
     else:

gssapi/raw/cython_converters.pxd

@@ -10,7 +10,7 @@ from gssapi.raw.types import MechType, NameType
 
 cdef gss_OID_set c_get_mech_oid_set(object mechs)
 cdef inline bint c_compare_oids(gss_OID a, gss_OID b)
-cdef object c_create_mech_list(gss_OID_set mech_set, bint free=*)
+cdef object c_create_oid_set(gss_OID_set mech_set, bint free=*)
 cdef OID c_make_oid(gss_OID oid)
 
 cdef inline OM_uint32 c_py_ttl_to_c(object ttl) except? 1:

gssapi/raw/cython_converters.pyx

@@ -26,15 +26,15 @@ cdef gss_OID_set c_get_mech_oid_set(object mechs):
     return res_set
 
 
-cdef object c_create_mech_list(gss_OID_set mech_set, bint free=True):
-    """Convert a set of GSS mechanism OIDs to a list of MechType values."""
+cdef object c_create_oid_set(gss_OID_set mech_set, bint free=True):
+    """Convert a GSS OID set struct to a set of OIDs"""
 
-    l = []
+    l = set()
     cdef i
     for i in range(mech_set.count):
         mech_type = OID()
         mech_type._copy_from(mech_set.elements[i])
-        l.append(mech_type)
+        l.add(mech_type)
 
     cdef OM_uint32 tmp_min_stat
     if free:

gssapi/raw/ext_cred_store.pyx

@@ -7,7 +7,7 @@ from gssapi.raw.cython_types cimport *
 from gssapi.raw.names cimport Name
 from gssapi.raw.creds cimport Creds
 from gssapi.raw.oids cimport OID
-from gssapi.raw.cython_converters cimport c_create_mech_list
+from gssapi.raw.cython_converters cimport c_create_oid_set
 from gssapi.raw.cython_converters cimport c_get_mech_oid_set
 from gssapi.raw.cython_converters cimport c_c_ttl_to_py, c_py_ttl_to_c
 
@@ -174,7 +174,7 @@ def acquire_cred_from(dict store, Name name, ttl=None,
     cdef Creds rc = Creds()
     if maj_stat == GSS_S_COMPLETE:
         rc.raw_creds = creds
-        return AcquireCredResult(rc, c_create_mech_list(actual_mechs),
+        return AcquireCredResult(rc, c_create_oid_set(actual_mechs),
                                  c_c_ttl_to_py(actual_ttl))
     else:
         raise GSSError(maj_stat, min_stat)
@@ -264,7 +264,7 @@ def add_cred_from(dict store, Creds input_creds,
     if maj_stat == GSS_S_COMPLETE:
         rc = Creds()
         rc.raw_creds = creds
-        return AddCredResult(rc, c_create_mech_list(actual_mechs),
+        return AddCredResult(rc, c_create_oid_set(actual_mechs),
                              c_c_ttl_to_py(actual_initiator_ttl),
                              c_c_ttl_to_py(actual_acceptor_ttl))
     else:
@@ -348,7 +348,7 @@ def store_cred_into(dict store, Creds creds not None,
         else:
             py_actual_usage = 'both'
 
-        return StoreCredResult(c_create_mech_list(actual_mech_types),
+        return StoreCredResult(c_create_oid_set(actual_mech_types),
                                py_actual_usage)
     else:
         raise GSSError(maj_stat, min_stat)

gssapi/raw/ext_rfc5588.pyx

@@ -2,7 +2,7 @@ from gssapi.raw.cython_types cimport *
 from gssapi.raw.names cimport Name
 from gssapi.raw.creds cimport Creds
 from gssapi.raw.oids cimport OID
-from gssapi.raw.cython_converters cimport c_create_mech_list
+from gssapi.raw.cython_converters cimport c_create_oid_set
 GSSAPI="BASE"  # This ensures that a full module is generated by Cython
 
 from gssapi.raw.cython_converters cimport c_get_mech_oid_set
@@ -80,7 +80,7 @@ def store_cred(Creds creds not None, cred_usage='both', OID mech=None,
         else:
             py_actual_usage = 'both'
 
-        return StoreCredResult(c_create_mech_list(actual_mech_types),
+        return StoreCredResult(c_create_oid_set(actual_mech_types),
                                py_actual_usage)
     else:
         raise GSSError(maj_stat, min_stat)

gssapi/raw/ext_s4u.pyx

@@ -1,7 +1,7 @@
 GSSAPI="BASE"  # This ensures that a full module is generated by Cython
 
 from gssapi.raw.cython_types cimport *
-from gssapi.raw.cython_converters cimport c_create_mech_list
+from gssapi.raw.cython_converters cimport c_create_oid_set
 from gssapi.raw.cython_converters cimport c_get_mech_oid_set
 from gssapi.raw.cython_converters cimport c_py_ttl_to_c, c_c_ttl_to_py
 from gssapi.raw.creds cimport Creds
@@ -102,7 +102,7 @@ def acquire_cred_impersonate_name(Creds impersonator_cred not None,
     cdef Creds rc = Creds()
     if maj_stat == GSS_S_COMPLETE:
         rc.raw_creds = creds
-        return AcquireCredResult(rc, c_create_mech_list(actual_mechs),
+        return AcquireCredResult(rc, c_create_oid_set(actual_mechs),
                                  c_c_ttl_to_py(actual_ttl))
     else:
         raise GSSError(maj_stat, min_stat)
@@ -181,7 +181,7 @@ def add_cred_impersonate_name(Creds input_cred not None,
     if maj_stat == GSS_S_COMPLETE:
         rc = Creds()
         rc.raw_creds = creds
-        return AddCredResult(rc, c_create_mech_list(actual_mechs),
+        return AddCredResult(rc, c_create_oid_set(actual_mechs),
                              c_c_ttl_to_py(actual_initiator_ttl),
                              c_c_ttl_to_py(actual_acceptor_ttl))
     else:

gssapi/raw/misc.pyx

@@ -5,7 +5,7 @@ import locale  # for decoding error messages
 import six
 
 from gssapi.raw.cython_types cimport *
-from gssapi.raw.cython_converters cimport c_create_mech_list
+from gssapi.raw.cython_converters cimport c_create_oid_set
 from gssapi.raw.oids cimport OID
 
 from gssapi.raw.types import MechType
@@ -38,7 +38,7 @@ def indicate_mechs():
     maj_stat = gss_indicate_mechs(&min_stat, &mech_set)
 
     if maj_stat == GSS_S_COMPLETE:
-        return c_create_mech_list(mech_set)
+        return c_create_oid_set(mech_set)
     else:
         raise GSSError(maj_stat, min_stat)
 

gssapi/tests/test_raw.py

@@ -57,7 +57,7 @@ def test_indicate_mechs(self):
         mechs = gb.indicate_mechs()
 
         mechs.shouldnt_be_none()
-        mechs.should_be_a(list)
+        mechs.should_be_a(set)
         mechs.shouldnt_be_empty()
 
         mechs.should_include(gb.MechType.kerberos)