traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.6

This commit is contained in:
Victor Stinner 2016-11-22 15:30:53 +01:00
parent 9ad8a639f3 bcf4dccfa7
commit 0b87b69a6e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_re.py
View File

@ -1781,6 +1781,10 @@ SUBPATTERN None 0 0
def test_pattern_compare(self):
pattern1 = re.compile('abc', re.IGNORECASE)
# equal to itself
self.assertEqual(pattern1, pattern1)
self.assertFalse(pattern1 != pattern1)
# equal
re.purge()
pattern2 = re.compile('abc', re.IGNORECASE)

8
Modules/_sre.c
View File

@ -2683,12 +2683,18 @@ pattern_richcompare(PyObject *lefto, PyObject *righto, int op)
if (Py_TYPE(lefto) != &Pattern_Type || Py_TYPE(righto) != &Pattern_Type) {
Py_RETURN_NOTIMPLEMENTED;
}
if (lefto == righto) {
/* a pattern is equal to itself */
return PyBool_FromLong(op == Py_EQ);
}
left = (PatternObject *)lefto;
right = (PatternObject *)righto;
cmp = (left->flags == right->flags
&& left->isbytes == right->isbytes
&& left->codesize && right->codesize);
&& left->codesize == right->codesize);
if (cmp) {
/* Compare the code and the pattern because the same pattern can
produce different codes depending on the locale used to compile the