Commitbb5d72c

authored

Merge pull requestpython#34 from nanjekyejoannah/warn_string_cmp_with_recent_assumptions

Warn for string cmp with new string warning assumptions

2 parents35e650e +29ae1a9 commitbb5d72cCopy full SHA for bb5d72c

File tree

+24

-0

lines changed

+24

-0

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,23 @@ def test_unicode(self):`
`166`	`166`	`self.assertEqual(s,unicode('abcuvwxyz!'))`
`167`	`167`	`self.assertEqual(type(s),types.UnicodeType)`
`168`	`168`
	`169`	`+deftest_py3k_string_cmp(self):`
	`170`	`+"abc"==123`
	`171`	`+"abc"==object()`
	`172`	`+u"abc"==123`
	`173`	`+u"abc"==object()`
	`174`	`+withtest_support.check_py3k_warnings(("comparing unicode and byte strings has different semantics in 3.x: convert the first string to bytes.",`
	`175`	`+DeprecationWarning)):`
	`176`	`+u"test str"=="test unicode"`
	`177`	`+deprecations= []`
	`178`	`+ifsys.py3kwarning:`
	`179`	`+deprecations+= [`
	`180`	`+ ("comparing unicode and byte strings has different semantics in 3.x: convert the second string to byte.",DeprecationWarning),`
	`181`	`+ ("comparing unicode and byte strings has different semantics in 3.x: convert the first string to bytes.",DeprecationWarning)`
	`182`	`+ ]`
	`183`	`+withtest_support.check_py3k_warnings(*deprecations):`
	`184`	`+"test str"==u"test unicode"`
	`185`	`+`
`169`	`186`	`classTestcStringIO(TestGenericStringIO):`
`170`	`187`	`MODULE=cStringIO`
`171`	`188`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1209,6 +1209,9 @@ string_richcompare(PyStringObject a, PyStringObject b, int op)`
`1209`	`1209`	`PyObject*result;`
`1210`	`1210`
`1211`	`1211`	`/* Make sure both arguments are strings. */`
	`1212`	`+if ((PyString_Check(a)&&PyUnicode_Check(b))&&PyErr_WarnPy3k("comparing unicode and byte strings has different semantics in 3.x: convert the second string to byte.",1)<0) {`
	`1213`	`+ gotoout;`
	`1214`	`+ }`
`1212`	`1215`	`if (!(PyString_Check(a)&&PyString_Check(b))) {`
`1213`	`1216`	`result=Py_NotImplemented;`
`1214`	`1217`	`gotoout;`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6269,6 +6269,10 @@ PyObject PyUnicode_RichCompare(PyObject left,`
`6269`	`6269`	`{`
`6270`	`6270`	`intresult;`
`6271`	`6271`
	`6272`	`+if (PyString_Check(right)&&PyErr_WarnPy3k("comparing unicode and byte strings has different semantics in 3.x: convert the first string to bytes.",1)<0){`
	`6273`	`+ gotoonError;`
	`6274`	`+ }`
	`6275`	`+`
`6272`	`6276`	`result=PyUnicode_Compare(left,right);`
`6273`	`6277`	`if (result==-1&&PyErr_Occurred())`
`6274`	`6278`	`gotoonError;`

Comments

(0)