Replace PYWIN_ATTR_CONVERT with PyUnicode_AsUTF8

Author: Avasam

Pythonwin/win32cmdui.cpp

@@ -282,7 +282,7 @@ static struct PyMethodDef PyCCmdUI_methods[] = {
 
 PyObject *PyCCmdUI::getattro(PyObject *obname)
 {
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (strcmp(name, "m_nIndex") == 0) {  // @prop int|m_nIndex|
         CCmdUI *pCU = PyCCmdUI::GetCCmdUIPtr(this);
         if (!pCU)

Pythonwin/win32dlg.cpp

@@ -171,7 +171,7 @@ PyCDialog::~PyCDialog()
 
 PyObject *PyCDialog::getattro(PyObject *obname)
 {
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (strcmp(name, "data") == 0) {
         Py_INCREF(dddict);
         return dddict;

Pythonwin/win32toolbar.cpp

@@ -164,7 +164,7 @@ struct MyMemberList dcmembers[] = {
 
 PyObject *PyCDockContext::getattro(PyObject *obname)
 {
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (name == NULL)
         return NULL;
     CDockContext *pC = GetDockContext(this);
@@ -200,7 +200,7 @@ PyObject *PyCDockContext::getattro(PyObject *obname)
 
 int PyCDockContext::setattro(PyObject *obname, PyObject *value)
 {
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (name == NULL)
         return -1;
     CDockContext *pC = GetDockContext(this);
@@ -446,7 +446,7 @@ static struct PyMethodDef PyCControlBar_methods[] = {
 
 PyObject *PyCControlBar::getattro(PyObject *obname)
 {
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (name == NULL)
         return NULL;
     CControlBar *pCtlBar = PyCControlBar::GetControlBar(this);
@@ -477,7 +477,7 @@ PyObject *PyCControlBar::getattro(PyObject *obname)
 
 int PyCControlBar::setattro(PyObject *obname, PyObject *v)
 {
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (name == NULL)
         return -1;
 

Pythonwin/win32util.cpp

@@ -92,7 +92,7 @@ static PySequenceMethods PyCRect_Sequence = {
 
 PyObject *PyCRect::getattro(PyObject *obname)
 {
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (name == NULL)
         return NULL;
     if (strcmp(name, "left") == 0)
@@ -140,7 +140,7 @@ CString PyCRect::repr()
 
 int PyCRect::setattro(PyObject *obname, PyObject *v)
 {
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (name == NULL)
         return -1;
     int intval = PyLong_AsLong(v);

com/win32com/src/PyIBase.cpp

@@ -32,14 +32,14 @@ PyObject *PyIBase::getattr(char *name) { return PyObject_GetAttrString(this, nam
 
 /*static*/ int PyIBase::setattro(PyObject *op, PyObject *obname, PyObject *v)
 {
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (name == NULL)
         return -1;
     PyIBase *bc = (PyIBase *)op;
     return bc->setattr(name, v);
 }
 
-int PyIBase::setattr(char *name, PyObject *v)
+int PyIBase::setattr(const char *name, PyObject *v)
 {
     char buf[128];
     sprintf(buf, "%s has read-only attributes", ob_type->tp_name);

com/win32com/src/PyRecord.cpp

@@ -590,7 +590,7 @@ PyObject *PyRecord::getattro(PyObject *self, PyObject *obname)
     PyRecord *pyrec = (PyRecord *)self;
     GUID structguid;
     OLECHAR *guidString;
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (name == NULL)
         return NULL;
     if (strcmp(name, "__record_type_guid__") == 0) {

com/win32com/src/extensions/PySTGMEDIUM.cpp

@@ -230,7 +230,7 @@ void PySTGMEDIUM::Close()
 
 PyObject *PySTGMEDIUM::getattro(PyObject *self, PyObject *obname)
 {
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (name == NULL)
         return NULL;
 

com/win32com/src/include/PythonCOM.h

@@ -168,7 +168,7 @@ class PYCOM_EXPORT PyIBase : public PyObject {
    public:
     // virtuals for Python support
     virtual PyObject *getattr(char *name);
-    virtual int setattr(char *name, PyObject *v);
+    virtual int setattr(const char *name, PyObject *v);
     virtual PyObject *repr();
     virtual int compare(PyObject *other)
     {

com/win32comext/adsi/src/PyADSIUtil.cpp

@@ -449,7 +449,7 @@ class PyADS_ATTR_INFO : public PyObject {
 
     static PyObject *getattro(PyObject *self, PyObject *obname)
     {
-        char *name = PYWIN_ATTR_CONVERT(obname);
+        const char *name = PyUnicode_AsUTF8(obname);
         if (name == NULL)
             return NULL;
         if (strcmp(name, "__members__") == 0) {

com/win32comext/directsound/src/PyDSBUFFERDESC.cpp

@@ -103,8 +103,8 @@ PyTypeObject PyDSBUFFERDESCType = {
     // IDirectSound::CreateSoundBuffer call. With this flag set, an application using DirectSound can continue to play
     // its sticky focus buffers if the user switches to another application not using DirectSound. In this situation,
     // the application's normal buffers are muted, but the sticky focus buffers are still audible. This is useful for
-    // nongame applications, such as movie playback (DirectShow™), when the user wants to hear the soundtrack while
-    // typing in Microsoft Word or Microsoft® Excel, for example. However, if the user switches to another DirectSound
+    // nongame applications, such as movie playback (DirectShow�), when the user wants to hear the soundtrack while
+    // typing in Microsoft Word or Microsoft� Excel, for example. However, if the user switches to another DirectSound
     // application, all sound buffers, both normal and sticky focus, in the previous application are muted.
     // @flag DSBCAPS_GLOBALFOCUS|The buffer is a global sound buffer. With this flag set, an application using
     // DirectSound can continue to play its buffers if the user switches focus to another application, even if the new
@@ -167,7 +167,7 @@ PyDSBUFFERDESC::~PyDSBUFFERDESC() { Py_XDECREF(m_obWFX); }
 int PyDSBUFFERDESC::setattro(PyObject *self, PyObject *obname, PyObject *obvalue)
 {
     PyDSBUFFERDESC *obself = (PyDSBUFFERDESC *)self;
-    char *name = PYWIN_ATTR_CONVERT(obname);
+    const char *name = PyUnicode_AsUTF8(obname);
     if (name == NULL)
         return -1;