home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.1065 < prev    next >
Encoding:
Internet Message Format  |  2013-05-29  |  11.6 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.1065
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.3.1065
  11. Problem:    Python: key mapping is not standard.
  12. Solution:   Puthon patch 24: use PyMapping_Keys. (ZyX)
  13. Files:        src/if_py_both.h, src/if_python3.c, src/if_python.c
  14.  
  15.  
  16. *** ../vim-7.3.1064/src/if_py_both.h    2013-05-30 13:17:13.000000000 +0200
  17. --- src/if_py_both.h    2013-05-30 13:19:50.000000000 +0200
  18. ***************
  19. *** 4612,4621 ****
  20.       char_u    *key;
  21.       dictitem_T    *di;
  22.       PyObject    *list;
  23. !     PyObject    *litem;
  24.       PyObject    *keyObject;
  25.       PyObject    *valObject;
  26. -     Py_ssize_t    lsize;
  27.   
  28.       if (!(dict = dict_alloc()))
  29.       return -1;
  30. --- 4612,4620 ----
  31.       char_u    *key;
  32.       dictitem_T    *di;
  33.       PyObject    *list;
  34. !     PyObject    *iterator;
  35.       PyObject    *keyObject;
  36.       PyObject    *valObject;
  37.   
  38.       if (!(dict = dict_alloc()))
  39.       return -1;
  40. ***************
  41. *** 4623,4683 ****
  42.       tv->v_type = VAR_DICT;
  43.       tv->vval.v_dict = dict;
  44.   
  45. !     list = PyMapping_Items(obj);
  46. !     if (list == NULL)
  47.       {
  48.       dict_unref(dict);
  49.       return -1;
  50.       }
  51. -     lsize = PyList_Size(list);
  52. -     while (lsize--)
  53. -     {
  54. -     DICTKEY_DECL
  55.   
  56. !     litem = PyList_GetItem(list, lsize);
  57. !     if (litem == NULL)
  58. !     {
  59. !         Py_DECREF(list);
  60. !         dict_unref(dict);
  61. !         return -1;
  62. !     }
  63.   
  64. !     if (!(keyObject = PyTuple_GetItem(litem, 0)))
  65. !     {
  66. !         Py_DECREF(list);
  67. !         Py_DECREF(litem);
  68. !         dict_unref(dict);
  69. !         return -1;
  70. !     }
  71.   
  72.       if (!DICTKEY_SET_KEY)
  73.       {
  74.           dict_unref(dict);
  75. -         Py_DECREF(list);
  76. -         Py_DECREF(litem);
  77.           DICTKEY_UNREF
  78.           return -1;
  79.       }
  80.       DICTKEY_CHECK_EMPTY(-1)
  81.   
  82. !     if (!(valObject = PyTuple_GetItem(litem, 1)))
  83.       {
  84. !         Py_DECREF(list);
  85. !         Py_DECREF(litem);
  86.           dict_unref(dict);
  87.           DICTKEY_UNREF
  88.           return -1;
  89.       }
  90.   
  91. -     Py_DECREF(litem);
  92. - 
  93.       di = dictitem_alloc(key);
  94.   
  95.       DICTKEY_UNREF
  96.   
  97.       if (di == NULL)
  98.       {
  99. !         Py_DECREF(list);
  100.           dict_unref(dict);
  101.           PyErr_NoMemory();
  102.           return -1;
  103. --- 4622,4673 ----
  104.       tv->v_type = VAR_DICT;
  105.       tv->vval.v_dict = dict;
  106.   
  107. !     if (!(list = PyMapping_Keys(obj)))
  108.       {
  109.       dict_unref(dict);
  110.       return -1;
  111.       }
  112.   
  113. !     if (!(iterator = PyObject_GetIter(list)))
  114. !     {
  115. !     dict_unref(dict);
  116. !     Py_DECREF(list);
  117. !     return -1;
  118. !     }
  119. !     Py_DECREF(list);
  120.   
  121. !     while ((keyObject = PyIter_Next(iterator)))
  122. !     {
  123. !     DICTKEY_DECL
  124.   
  125.       if (!DICTKEY_SET_KEY)
  126.       {
  127. +         Py_DECREF(iterator);
  128.           dict_unref(dict);
  129.           DICTKEY_UNREF
  130.           return -1;
  131.       }
  132.       DICTKEY_CHECK_EMPTY(-1)
  133.   
  134. !     if (!(valObject = PyObject_GetItem(obj, keyObject)))
  135.       {
  136. !         Py_DECREF(keyObject);
  137. !         Py_DECREF(iterator);
  138.           dict_unref(dict);
  139.           DICTKEY_UNREF
  140.           return -1;
  141.       }
  142.   
  143.       di = dictitem_alloc(key);
  144.   
  145.       DICTKEY_UNREF
  146.   
  147. +     Py_DECREF(keyObject);
  148. + 
  149.       if (di == NULL)
  150.       {
  151. !         Py_DECREF(iterator);
  152. !         Py_DECREF(valObject);
  153.           dict_unref(dict);
  154.           PyErr_NoMemory();
  155.           return -1;
  156. ***************
  157. *** 4686,4708 ****
  158.   
  159.       if (_ConvertFromPyObject(valObject, &di->di_tv, lookup_dict) == -1)
  160.       {
  161.           vim_free(di);
  162.           dict_unref(dict);
  163. -         Py_DECREF(list);
  164.           return -1;
  165.       }
  166.   
  167.       if (dict_add(dict, di) == FAIL)
  168.       {
  169.           dictitem_free(di);
  170.           dict_unref(dict);
  171. -         Py_DECREF(list);
  172.           PyErr_SetVim(_("failed to add key to dictionary"));
  173.           return -1;
  174.       }
  175.       }
  176.       --dict->dv_refcount;
  177. -     Py_DECREF(list);
  178.       return 0;
  179.   }
  180.   
  181. --- 4676,4701 ----
  182.   
  183.       if (_ConvertFromPyObject(valObject, &di->di_tv, lookup_dict) == -1)
  184.       {
  185. +         Py_DECREF(iterator);
  186. +         Py_DECREF(valObject);
  187.           vim_free(di);
  188.           dict_unref(dict);
  189.           return -1;
  190.       }
  191.   
  192. +     Py_DECREF(valObject);
  193. + 
  194.       if (dict_add(dict, di) == FAIL)
  195.       {
  196. +         Py_DECREF(iterator);
  197.           dictitem_free(di);
  198.           dict_unref(dict);
  199.           PyErr_SetVim(_("failed to add key to dictionary"));
  200.           return -1;
  201.       }
  202.       }
  203. +     Py_DECREF(iterator);
  204.       --dict->dv_refcount;
  205.       return 0;
  206.   }
  207.   
  208. ***************
  209. *** 4907,4912 ****
  210. --- 4900,4907 ----
  211.       tv->vval.v_float = (float_T) PyFloat_AsDouble(obj);
  212.       }
  213.   #endif
  214. +     else if (PyObject_HasAttrString(obj, "keys"))
  215. +     return convert_dl(obj, tv, pymap_to_tv, lookup_dict);
  216.       else if (PyIter_Check(obj) || PySequence_Check(obj))
  217.       return convert_dl(obj, tv, pyseq_to_tv, lookup_dict);
  218.       else if (PyMapping_Check(obj))
  219. *** ../vim-7.3.1064/src/if_python3.c    2013-05-30 13:01:14.000000000 +0200
  220. --- src/if_python3.c    2013-05-30 13:19:50.000000000 +0200
  221. ***************
  222. *** 160,168 ****
  223.   # define PyDict_GetItemString py3_PyDict_GetItemString
  224.   # define PyDict_Next py3_PyDict_Next
  225.   # define PyMapping_Check py3_PyMapping_Check
  226. ! # define PyMapping_Items py3_PyMapping_Items
  227.   # define PyIter_Next py3_PyIter_Next
  228.   # define PyObject_GetIter py3_PyObject_GetIter
  229.   # define PyObject_IsTrue py3_PyObject_IsTrue
  230.   # define PyModule_GetDict py3_PyModule_GetDict
  231.   #undef PyRun_SimpleString
  232. --- 160,169 ----
  233.   # define PyDict_GetItemString py3_PyDict_GetItemString
  234.   # define PyDict_Next py3_PyDict_Next
  235.   # define PyMapping_Check py3_PyMapping_Check
  236. ! # define PyMapping_Keys py3_PyMapping_Keys
  237.   # define PyIter_Next py3_PyIter_Next
  238.   # define PyObject_GetIter py3_PyObject_GetIter
  239. + # define PyObject_GetItem py3_PyObject_GetItem
  240.   # define PyObject_IsTrue py3_PyObject_IsTrue
  241.   # define PyModule_GetDict py3_PyModule_GetDict
  242.   #undef PyRun_SimpleString
  243. ***************
  244. *** 276,282 ****
  245.   static Py_ssize_t (*py3_PyTuple_Size)(PyObject *);
  246.   static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
  247.   static int (*py3_PyMapping_Check)(PyObject *);
  248. ! static PyObject* (*py3_PyMapping_Items)(PyObject *);
  249.   static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length,
  250.                Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelength);
  251.   static PyObject* (*py3_PyErr_NoMemory)(void);
  252. --- 277,283 ----
  253.   static Py_ssize_t (*py3_PyTuple_Size)(PyObject *);
  254.   static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
  255.   static int (*py3_PyMapping_Check)(PyObject *);
  256. ! static PyObject* (*py3_PyMapping_Keys)(PyObject *);
  257.   static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length,
  258.                Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelength);
  259.   static PyObject* (*py3_PyErr_NoMemory)(void);
  260. ***************
  261. *** 304,309 ****
  262. --- 305,311 ----
  263.   static PyObject* (*py3_PyDict_New)(void);
  264.   static PyObject* (*py3_PyIter_Next)(PyObject *);
  265.   static PyObject* (*py3_PyObject_GetIter)(PyObject *);
  266. + static PyObject* (*py3_PyObject_GetItem)(PyObject *, PyObject *);
  267.   static int (*py3_PyObject_IsTrue)(PyObject *);
  268.   static PyObject* (*py3_Py_BuildValue)(char *, ...);
  269.   static int (*py3_PyType_Ready)(PyTypeObject *type);
  270. ***************
  271. *** 456,464 ****
  272.       {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString},
  273.       {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next},
  274.       {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check},
  275. !     {"PyMapping_Items", (PYTHON_PROC*)&py3_PyMapping_Items},
  276.       {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next},
  277.       {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter},
  278.       {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue},
  279.       {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong},
  280.       {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New},
  281. --- 458,467 ----
  282.       {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString},
  283.       {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next},
  284.       {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check},
  285. !     {"PyMapping_Keys", (PYTHON_PROC*)&py3_PyMapping_Keys},
  286.       {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next},
  287.       {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter},
  288. +     {"PyObject_GetItem", (PYTHON_PROC*)&py3_PyObject_GetItem},
  289.       {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue},
  290.       {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong},
  291.       {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New},
  292. *** ../vim-7.3.1064/src/if_python.c    2013-05-30 13:01:14.000000000 +0200
  293. --- src/if_python.c    2013-05-30 13:19:50.000000000 +0200
  294. ***************
  295. *** 197,207 ****
  296.   # define PyDict_GetItemString dll_PyDict_GetItemString
  297.   # define PyDict_Next dll_PyDict_Next
  298.   # define PyDict_Type (*dll_PyDict_Type)
  299. ! # ifdef PyMapping_Items
  300. ! #  define PY_NO_MAPPING_ITEMS
  301.   # else
  302. ! #  define PyMapping_Items dll_PyMapping_Items
  303.   # endif
  304.   # define PyObject_CallMethod dll_PyObject_CallMethod
  305.   # define PyMapping_Check dll_PyMapping_Check
  306.   # define PyIter_Next dll_PyIter_Next
  307. --- 197,208 ----
  308.   # define PyDict_GetItemString dll_PyDict_GetItemString
  309.   # define PyDict_Next dll_PyDict_Next
  310.   # define PyDict_Type (*dll_PyDict_Type)
  311. ! # ifdef PyMapping_Keys
  312. ! #  define PY_NO_MAPPING_KEYS
  313.   # else
  314. ! #  define PyMapping_Keys dll_PyMapping_Keys
  315.   # endif
  316. + # define PyObject_GetItem dll_PyObject_GetItem
  317.   # define PyObject_CallMethod dll_PyObject_CallMethod
  318.   # define PyMapping_Check dll_PyMapping_Check
  319.   # define PyIter_Next dll_PyIter_Next
  320. ***************
  321. *** 331,339 ****
  322.   static PyObject*(*dll_PyDict_GetItemString)(PyObject *, const char *);
  323.   static int (*dll_PyDict_Next)(PyObject *, PyInt *, PyObject **, PyObject **);
  324.   static PyTypeObject* dll_PyDict_Type;
  325. ! # ifndef PY_NO_MAPPING_ITEMS
  326. ! static PyObject* (*dll_PyMapping_Items)(PyObject *);
  327.   # endif
  328.   static PyObject* (*dll_PyObject_CallMethod)(PyObject *, char *, PyObject *);
  329.   static int (*dll_PyMapping_Check)(PyObject *);
  330.   static PyObject* (*dll_PyIter_Next)(PyObject *);
  331. --- 332,341 ----
  332.   static PyObject*(*dll_PyDict_GetItemString)(PyObject *, const char *);
  333.   static int (*dll_PyDict_Next)(PyObject *, PyInt *, PyObject **, PyObject **);
  334.   static PyTypeObject* dll_PyDict_Type;
  335. ! # ifndef PY_NO_MAPPING_KEYS
  336. ! static PyObject* (*dll_PyMapping_Keys)(PyObject *);
  337.   # endif
  338. + static PyObject* (*dll_PyObject_GetItem)(PyObject *, PyObject *);
  339.   static PyObject* (*dll_PyObject_CallMethod)(PyObject *, char *, PyObject *);
  340.   static int (*dll_PyMapping_Check)(PyObject *);
  341.   static PyObject* (*dll_PyIter_Next)(PyObject *);
  342. ***************
  343. *** 494,502 ****
  344.       {"PyDict_Next", (PYTHON_PROC*)&dll_PyDict_Next},
  345.       {"PyDict_New", (PYTHON_PROC*)&dll_PyDict_New},
  346.       {"PyDict_Type", (PYTHON_PROC*)&dll_PyDict_Type},
  347. ! # ifndef PY_NO_MAPPING_ITEMS
  348. !     {"PyMapping_Items", (PYTHON_PROC*)&dll_PyMapping_Items},
  349.   # endif
  350.       {"PyObject_CallMethod", (PYTHON_PROC*)&dll_PyObject_CallMethod},
  351.       {"PyMapping_Check", (PYTHON_PROC*)&dll_PyMapping_Check},
  352.       {"PyIter_Next", (PYTHON_PROC*)&dll_PyIter_Next},
  353. --- 496,505 ----
  354.       {"PyDict_Next", (PYTHON_PROC*)&dll_PyDict_Next},
  355.       {"PyDict_New", (PYTHON_PROC*)&dll_PyDict_New},
  356.       {"PyDict_Type", (PYTHON_PROC*)&dll_PyDict_Type},
  357. ! # ifndef PY_NO_MAPPING_KEYS
  358. !     {"PyMapping_Keys", (PYTHON_PROC*)&dll_PyMapping_Keys},
  359.   # endif
  360. +     {"PyObject_GetItem", (PYTHON_PROC*)&dll_PyObject_GetItem},
  361.       {"PyObject_CallMethod", (PYTHON_PROC*)&dll_PyObject_CallMethod},
  362.       {"PyMapping_Check", (PYTHON_PROC*)&dll_PyMapping_Check},
  363.       {"PyIter_Next", (PYTHON_PROC*)&dll_PyIter_Next},
  364. *** ../vim-7.3.1064/src/version.c    2013-05-30 13:17:13.000000000 +0200
  365. --- src/version.c    2013-05-30 13:19:32.000000000 +0200
  366. ***************
  367. *** 730,731 ****
  368. --- 730,733 ----
  369.   {   /* Add new patch number below this line */
  370. + /**/
  371. +     1065,
  372.   /**/
  373.  
  374. -- 
  375. How To Keep A Healthy Level Of Insanity:
  376. 8. Don't use any punctuation marks.
  377.  
  378.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  379. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  380. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  381.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  382.