better find substring

pydflatex/latexlogparser.py

@@ -77,7 +77,7 @@ def errors (self):
 				# sometimes issues warnings (like undefined references) in the
 				# form of errors...
 
-				if string.find(line, "pdfTeX warning") == -1:
+				if "pdfTeX warning" in line:
 					return True
 		return False
 
@@ -159,7 +159,7 @@ def parse (self, errors=False, boxes=False, refs=False, warnings=False):
 				if m:
 					parsing = False
 					skipping = True
-					pdfTeX = string.find(line, "pdfTeX warning") != -1
+					pdfTeX = "pdfTeX warning" in line
 					if (pdfTeX and warnings) or (errors and not pdfTeX):
 						if pdfTeX:
 							d = {
@@ -287,7 +287,7 @@ def parse (self, errors=False, boxes=False, refs=False, warnings=False):
 
 			# Other warnings
 
-			if line.find("Warning") != -1:
+			if "Warning" in line:
 				m = re_warning.match(line)
 				if m:
 					info = m.groupdict()

test/test_output.py

@@ -59,7 +59,7 @@ def assert_contains(self, match, line=None, regexp=False):
 		else:
 			out = all_out.splitlines()[line]
 		if not regexp:
-			does_match = out.find(match) != -1
+			does_match = match in out
 		else:
 			does_match = re.search(match, self.output, re.MULTILINE)
 		if not does_match:
@@ -117,7 +117,7 @@ def test_cite(self):
 
 	def test_nobox(self):
 		self.process_log('box')
-		self.assertEqual(self.output.find('Overfull'), -1)
+		self.assertNotIn('Overfull', self.output)
 
 	def test_unicode_missing(self):
 		self.t.xetex = True