Mercurial > hgrepos > Python > libs > ConfigMix

changeset 707:10fbc23b4dba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename internal variable FILTER_SEPARATOR_REV -> FILTER_SEPARATOR_2
author Franz Glasner <f.glasner@feldmann-mg.com>
date Tue, 15 Aug 2023 10:41:22 +0200
parents 59a3fb7fcac3
children e692216f8756
files configmix/_speedups.c configmix/config.py
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/configmix/_speedups.c	Tue Aug 15 10:38:38 2023 +0200
+++ b/configmix/_speedups.c	Tue Aug 15 10:41:22 2023 +0200
@@ -25,7 +25,7 @@
     PyObject *QUOTE;
     PyObject *NS_SEPARATOR;
     PyObject *FILTER_SEPARATOR;
-    PyObject *FILTER_SEPARATOR_REV;
+    PyObject *FILTER_SEPARATOR_2;
     PyObject *EMPTY_FILTER;
     PyObject *NONE_FILTER;
     PyObject *EMPTY_STR;
@@ -687,7 +687,7 @@
         tmp = PyUnicode_Split(filters, sstate->FILTER_SEPARATOR, -1);
     }
     else {
-        tmp = PyUnicode_Split(filters, sstate->FILTER_SEPARATOR_REV, -1);
+        tmp = PyUnicode_Split(filters, sstate->FILTER_SEPARATOR_2, -1);
     }
     if (tmp == NULL) {
         goto error;
@@ -1792,11 +1792,11 @@
     }
     PyUnicode_InternInPlace(&(sstate->FILTER_SEPARATOR));
 
-    sstate->FILTER_SEPARATOR_REV = PyUnicode_FromStringAndSize(",", 1);
-    if (sstate->FILTER_SEPARATOR_REV == NULL) {
+    sstate->FILTER_SEPARATOR_2 = PyUnicode_FromStringAndSize(",", 1);
+    if (sstate->FILTER_SEPARATOR_2 == NULL) {
         return -1;
     }
-    PyUnicode_InternInPlace(&(sstate->FILTER_SEPARATOR_REV));
+    PyUnicode_InternInPlace(&(sstate->FILTER_SEPARATOR_2));
 
     sstate->EMPTY_FILTER = PyUnicode_FromStringAndSize("Empty", 5);
     if (sstate->EMPTY_FILTER == NULL) {
@@ -1879,7 +1879,7 @@
         Py_VISIT(sstate->QUOTE);
         Py_VISIT(sstate->NS_SEPARATOR);
         Py_VISIT(sstate->FILTER_SEPARATOR);
-        Py_VISIT(sstate->FILTER_SEPARATOR_REV);
+        Py_VISIT(sstate->FILTER_SEPARATOR_2);
         Py_VISIT(sstate->EMPTY_FILTER);
         Py_VISIT(sstate->NONE_FILTER);
         Py_VISIT(sstate->EMPTY_STR);
@@ -1907,7 +1907,7 @@
         Py_CLEAR(sstate->QUOTE);
         Py_CLEAR(sstate->NS_SEPARATOR);
         Py_CLEAR(sstate->FILTER_SEPARATOR);
-        Py_CLEAR(sstate->FILTER_SEPARATOR_REV);
+        Py_CLEAR(sstate->FILTER_SEPARATOR_2);
         Py_CLEAR(sstate->EMPTY_FILTER);
         Py_CLEAR(sstate->NONE_FILTER);
         Py_CLEAR(sstate->EMPTY_STR);
--- a/configmix/config.py	Tue Aug 15 10:38:38 2023 +0200
+++ b/configmix/config.py	Tue Aug 15 10:41:22 2023 +0200
@@ -240,7 +240,7 @@
 _HIER_SEPARATOR = u(b'.')
 _NS_SEPARATOR = u(b':')
 _FILTER_SEPARATOR = u(b'|')
-_FILTER_SEPARATOR_REV = u(b',')
+_FILTER_SEPARATOR_2 = u(b',')
 _STARTTOK_REF = _STARTTOK + REF_NAMESPACE + _NS_SEPARATOR
 _ENDTOK_REF = _ENDTOK
 _ENDTOK_FILTER = _FILTER_SEPARATOR + _ENDTOK
@@ -453,7 +453,7 @@
             if direction == 1:
                 return (name, filters.split(_FILTER_SEPARATOR))
             else:
-                return (name, filters.split(_FILTER_SEPARATOR_REV))
+                return (name, filters.split(_FILTER_SEPARATOR_2))
         else:
             return (name, [])
     else: