Deprecate Netscape workarounds and remove broken test

Pythonwin/ddeconv.cpp

@@ -103,14 +103,15 @@ PyObject *PyDDEConv_Poke(PyObject *self, PyObject *args)
         return NULL;
     TCHAR *szCmd;
     PyObject *obCmd;
+    // TODO: How would this code look like w/o consideration for Netscape ?
     void *pData = NULL;  // may be empty, as for Netscape's use of Poke
     Py_ssize_t size = 0;
     if (!PyArg_ParseTuple(args, "O|z#:Poke", &obCmd, &pData, &size))
         return NULL;
     if (!PyWinObject_AsTCHAR(obCmd, &szCmd, FALSE))
         return NULL;
     GUI_BGN_SAVE;
-    BOOL ok = pConv->Poke(szCmd, pData, size);
+    BOOL ok = pConv->Poke(CF_TEXT, szCmd, pData, size);
     GUI_END_SAVE;
     PyWinObject_FreeTCHAR(szCmd);
     if (!ok)

Pythonwin/ddemodule.cpp

@@ -22,23 +22,24 @@
   the internal list. Instead, the item must be evaluated by the
   Python server class.
 
-  Reason: Netscape makes heavy usage of string items and does not use
-    them in a fixed manner. Instead, the items are (ab)used as the
+  Reason: Netscape made heavy usage of string items and did not use
+    them in a fixed manner. Instead, the items were (ab)used as the
     parameter list in DDE_Poke and DDE_Request.
+    TODO: Netscape is long dead, so we could clean this up
 
   Server issues (Server):
   -----------------------
   Poke and Request are now exposed to the Python server interface.
   Poke    - does not require a result
-          - has an optional value parameter (not used by Netscape)
+          - has an optional value parameter (wasn't used by Netscape)
   Request - should return a string object
 
   Client issues (Conversation):
   -----------------------------
   Poke and Request are now available.
   Poke (item, value=None)
           - sends a Poke to it's conversation's server
-          - has an optional value parameter (not used by Netscape)
+          - has an optional value parameter (wasn't used by Netscape)
           - does not return anything
   Request (item)
           - sends a request to it's conversation's server

Pythonwin/readme.html

@@ -15,7 +15,7 @@ <H2>Introduction </H2>
 <a href="doc/debugger/index.html">integrated debugger</a>, and a rich Python
 editing environment. </P>
 <P>Pythonwin is implemented as a 'wrapper' for the Microsoft Foundation Class library. With it, you can use MFC in an interactive, interpreted environment, or write full blown stand-alone applications tightly coupled with the Windows environment. Over 30 MFC objects are exposed, including Common Controls, Property Pages/Sheets, Control/Toolbars, Threads, etc. </P>
-<P>Pythonwin could almost be considered a sample program for the MFC UI environment. This Python UI environment can be embedded in almost any other application - such as OLE clients/servers, Netscape plugins, as a Macro language etc. </P>
+<P>Pythonwin could almost be considered a sample program for the MFC UI environment. This Python UI environment can be embedded in almost any other application - such as OLE clients/servers, as a Macro language etc. </P>
 <P><A HREF="#RecentChanges">Recent changes can be found at the end of this document</A>.</P>
 <H2>Demos</H2>
 <P>There are many demos in the pywin\demos directory. To see a list of all the demos, run the program "pywin\demos\guidemo.py" from inside Pythonwin.</P>

Pythonwin/stddde.cpp

@@ -146,15 +146,28 @@ void CDDEItem::Create(const TCHAR *pszName) { m_strName = pszName; }
 BOOL CDDEItem::Request(UINT wFmt, CDDEAllocator &allocr) { return FALSE; }
 
 // CT BEGIN
-BOOL CDDEItem::NSRequest(const TCHAR *szItem, CDDEAllocator &allocr) { return FALSE; }
+BOOL CDDEItem::NSRequest(const TCHAR *szItem, CDDEAllocator &allocr)
+{
+    PyErr_Warn(PyExc_DeprecationWarning, "NSRequest is deprecated as Netscape is no longer supported");
+    return FALSE;
+}
 // CT END
 
 BOOL CDDEItem::Poke(UINT wFmt, void *pData, DWORD dwSize) { return FALSE; }
 
 // CT BEGIN
-BOOL CDDEItem::Poke(void *pData, DWORD dwSize) { return FALSE; }
+BOOL CDDEItem::Poke(void *pData, DWORD dwSize)
+{
+    PyErr_Warn(PyExc_DeprecationWarning,
+               "format-less version of Poke is deprecated as Netscape is no longer supported");
+    return FALSE;
+}
 
-BOOL CDDEItem::NSPoke(const TCHAR *szItem, void *pData, DWORD dwSize) { return FALSE; }
+BOOL CDDEItem::NSPoke(const TCHAR *szItem, void *pData, DWORD dwSize)
+{
+    PyErr_Warn(PyExc_DeprecationWarning, "NSPoke is deprecated as Netscape is no longer supported");
+    return FALSE;
+}
 // CT END
 
 BOOL CDDEItem::IsSupportedFormat(WORD wFormat)
@@ -276,7 +289,11 @@ BOOL CDDETopic::Request(UINT wFmt, const TCHAR *pszItem, CDDEAllocator &allocr)
 }
 
 // CT BEGIN
-BOOL CDDETopic::NSRequest(const TCHAR *szItem, CDDEAllocator &allocr) { return FALSE; }
+BOOL CDDETopic::NSRequest(const TCHAR *szItem, CDDEAllocator &allocr)
+{
+    PyErr_Warn(PyExc_DeprecationWarning, "NSRequest is deprecated as Netscape is no longer supported");
+    return FALSE;
+}
 // CT END
 
 BOOL CDDETopic::Poke(UINT wFmt, const TCHAR *pszItem, void *pData, DWORD dwSize)
@@ -300,9 +317,18 @@ BOOL CDDETopic::Poke(UINT wFmt, const TCHAR *pszItem, void *pData, DWORD dwSize)
 
 // CT BEGIN
 
-BOOL CDDETopic::Poke(const TCHAR *pszItem, void *pData, DWORD dwSize) { return Poke(CF_TEXT, pszItem, pData, dwSize); }
+BOOL CDDETopic::Poke(const TCHAR *pszItem, void *pData, DWORD dwSize)
+{
+    PyErr_Warn(PyExc_DeprecationWarning,
+               "format-less version of Poke is deprecated as Netscape is no longer supported");
+    return Poke(CF_TEXT, pszItem, pData, dwSize);
+}
 
-BOOL CDDETopic::NSPoke(const TCHAR *szItem, void *pData, DWORD dwSize) { return FALSE; }
+BOOL CDDETopic::NSPoke(const TCHAR *szItem, void *pData, DWORD dwSize)
+{
+    PyErr_Warn(PyExc_DeprecationWarning, "NSPoke is deprecated as Netscape is no longer supported");
+    return FALSE;
+}
 // CT END
 
 BOOL CDDETopic::Exec(void *pData, DWORD dwSize) { return FALSE; }
@@ -314,11 +340,14 @@ CDDEItem *CDDETopic::FindItem(const TCHAR *pszItem)
         CDDEItem *pItem = m_ItemList.GetNext(pos);
         // CT BEGIN
         // NETSCAPE Hack
+        // Netscape is long dead, so this is deprecated
         if (pItem->m_strName == "") {
+            PyErr_Warn(PyExc_DeprecationWarning,
+                       "Having an empty name is deprecated and was allowed for Netscape support");
             return pItem;
         }
-        // empty item matches all
         // CT END
+        // empty item matches all
         if (pItem->m_strName.CompareNoCase(pszItem) == 0)
             return pItem;
     }
@@ -545,7 +574,10 @@ BOOL CDDEConv::Poke(const TCHAR *pszItem, void *pData, DWORD dwSize)
 {
     //
     // format-less version for Netscape defaults to text
+    // Netscape is long dead, so this is deprecated
     //
+    PyErr_Warn(PyExc_DeprecationWarning,
+               "format-less version of Poke is deprecated as Netscape is no longer supported");
     return Poke(CF_TEXT, pszItem, pData, dwSize);
 }
 // CT END