ssl: fix for Python 2.7.9

geertj · Dec 23, 2014 · 274a798 · 274a798
1 parent e42135d
commit 274a798
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/gruvi/_sslcompat.c b/gruvi/_sslcompat.c
@@ -130,19 +130,17 @@ typedef struct
 } PySSLObject;
 
 
-#if PY_MAJOR_VERSION == 3
-#  define CHECK_SSL_OBJ(obj) \
-    do { \
-        if (strcmp(Py_TYPE(obj)->tp_name, "_ssl._SSLSocket")) \
-            RETURN_ERROR("expecting a _ssl._SSLSocket instance"); \
-    } while (0)
-#elif PY_MAJOR_VERSION == 2
-#  define CHECK_SSL_OBJ(obj) \
+#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7 && PY_MICRO_VERSION < 9
+#  define SSL_OBJ_NAME "ssl.SSLContext"
+#else
+#  define SSL_OBJ_NAME "_ssl._SSLSocket"
+#endif
+
+#define CHECK_SSL_OBJ(obj) \
     do { \
-        if (strcmp(Py_TYPE(obj)->tp_name, "ssl.SSLContext")) \
-            RETURN_ERROR("expecting a ssl.SSLContext instance"); \
+        if (strcmp(Py_TYPE(obj)->tp_name, SSL_OBJ_NAME)) \
+            RETURN_ERROR("expecting a " SSL_OBJ_NAME " instance"); \
     } while (0)
-#endif
 
 
 /* MemoryBIO type */