Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f825b4979b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							 
							
							
							
						 
						
							2017-09-05 19:44:33 -03:00  
						
					 
				
					
						
							
							
								 
								Fernando Macedo
							
						 
						
							 
							
							
							
							
								
							
							
								59cdef92be 
								
							 
						 
						
							
							
								
								fixes   #2731  ReprFuncArgs with mixed unicode and utf-8 args  
							
							 
							
							
							
						 
						
							2017-08-30 16:06:12 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								9e62a31b63 
								
							 
						 
						
							
							
								
								Merge pull request  #2650  from srinivasreddy/2642  
							
							 
							
							... 
							
							
							
							Fixed#2642: Convert py module references to six module 
							
						 
						
							2017-08-04 09:21:51 +02:00  
						
					 
				
					
						
							
							
								 
								Srinivas Reddy Thatiparthy
							
						 
						
							 
							
							
							
							
								
							
							
								dc563e4954 
								
							 
						 
						
							
							
								
								convert py module references to six module  
							
							 
							
							
							
						 
						
							2017-08-04 08:05:03 +05:30  
						
					 
				
					
						
							
							
								 
								Jordan Moldow
							
						 
						
							 
							
							
							
							
								
							
							
								2e61f702c0 
								
							 
						 
						
							
							
								
								Support PEP-415's Exception.__suppress_context__  
							
							 
							
							... 
							
							
							
							PEP-415 states that `exception.__context__` should be suppressed
in traceback outputs, if `exception.__suppress_context__` is
`True`.
Now if a ``raise exception from None`` is caught by pytest,
pytest will no longer chain the context in the test report.
The algorithm in `FormattedExcinfo` now better matches the one
in `traceback.TracebackException`.
`Exception.__suppress_context__` is available in all of the
versions of Python 3 that are supported by pytest.
Fixes  #2631 . 
							
						 
						
							2017-07-29 02:39:17 -07:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							 
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								17a21d540b 
								
							 
						 
						
							
							
								
								Fixed E301 flake8 errors  
							
							 
							
							... 
							
							
							
							expected 1 blank line, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								195a816522 
								
							 
						 
						
							
							
								
								Fixed E265 flake8 errors  
							
							 
							
							... 
							
							
							
							block comment should start with ‘# ‘ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								4b22f270a3 
								
							 
						 
						
							
							
								
								Fixed E226 flake8 errors  
							
							 
							
							... 
							
							
							
							missing whitespace around arithmetic operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								2e8caefcab 
								
							 
						 
						
							
							
								
								Fixed E225 flake8 errors  
							
							 
							
							... 
							
							
							
							missing whitespace around operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								3fabc4d219 
								
							 
						 
						
							
							
								
								Fixed E222 flake8 errors  
							
							 
							
							... 
							
							
							
							multiple spaces after operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								ba0a4d0b2e 
								
							 
						 
						
							
							
								
								Fixed E202 flake8 errors  
							
							 
							
							... 
							
							
							
							whitespace before ‘)’ 
							
						 
						
							2017-07-17 01:28:17 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								1c935db571 
								
							 
						 
						
							
							
								
								Fixed E129 flake8 errors  
							
							 
							
							... 
							
							
							
							visually indented line with same indent as next logical line 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							 
							
							... 
							
							
							
							continuation line under-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								92e2cd9c68 
								
							 
						 
						
							
							
								
								Fixed E125 flake8 errors  
							
							 
							
							... 
							
							
							
							continuation line with same indent as next logical line 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								6af2abdb53 
								
							 
						 
						
							
							
								
								Fixed flake8 warnings  
							
							 
							
							... 
							
							
							
							W191 indentation contains tabs
W292 no newline at end of file
W293 blank line contains whitespace
W391 blank line at end of file 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								8bb589fc5d 
								
							 
						 
						
							
							
								
								Fix internal error when trying to detect the start of a recursive traceback.  
							
							 
							
							... 
							
							
							
							Fix  #2486  
							
						 
						
							2017-06-09 19:26:26 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								2127a2378a 
								
							 
						 
						
							
							
								
								Fix internal error with recursive tracebacks with that frames contain objects that can't be compared  
							
							 
							
							... 
							
							
							
							Fix  #2459  
							
						 
						
							2017-06-07 14:40:13 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f3b359f5b8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	_pytest/capture.py
#	_pytest/compat.py
#	_pytest/python.py
#	testing/python/collect.py
#	testing/test_mark.py 
							
						 
						
							2017-05-03 19:04:53 -03:00  
						
					 
				
					
						
							
							
								 
								Michael Howitz
							
						 
						
							 
							
							
							
							
								
							
							
								7d4ac14a31 
								
							 
						 
						
							
							
								
								Fix   #2343 : Replace version checks by constants.  
							
							 
							
							... 
							
							
							
							This way they do not have to be recomputed at runtime. 
							
						 
						
							2017-04-12 08:18:09 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								42a5d6bdfa 
								
							 
						 
						
							
							
								
								Add __future__ imports to all pytest modules  
							
							 
							
							... 
							
							
							
							This prevents silly errors from creeping in Python 2 when testing in Python 3 
							
						 
						
							2017-03-16 22:45:40 -03:00  
						
					 
				
					
						
							
							
								 
								Omer Hadari
							
						 
						
							 
							
							
							
							
								
							
							
								6a52fe1650 
								
							 
						 
						
							
							
								
								fixed internal error on unprintable raised AssertionErrors  
							
							 
							
							
							
						 
						
							2017-03-04 10:26:46 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1eb5a690d4 
								
							 
						 
						
							
							
								
								Fix flake8 E305 and E306 errors  
							
							 
							
							... 
							
							
							
							These errors started to appear with flake8-3.1.1, while they don't appear with
version 3.1.0 (weird). 
							
						 
						
							2016-11-20 18:59:15 -02:00  
						
					 
				
					
						
							
							
								 
								Michael Seifert
							
						 
						
							 
							
							
							
							
								
							
							
								1e5b21cd61 
								
							 
						 
						
							
							
								
								Fix memory leak with pytest.raises by using weakref  
							
							 
							
							
							
						 
						
							2016-11-08 22:12:23 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								006a901b86 
								
							 
						 
						
							
							
								
								Properly handle exceptions in multiprocessing tasks  
							
							 
							
							... 
							
							
							
							Fix  #1984  
							
						 
						
							2016-11-03 10:48:43 -02:00  
						
					 
				
					
						
							
							
								 
								Roy Williams
							
						 
						
							 
							
							
							
							
								
							
							
								24db3c123d 
								
							 
						 
						
							
							
								
								Explicitly set  to None to have consistent behavior in Python 2 and Python 3  
							
							 
							
							
							
						 
						
							2016-09-22 09:22:12 -07:00  
						
					 
				
					
						
							
							
								 
								Roy Williams
							
						 
						
							 
							
							
							
							
								
							
							
								940ed7e943 
								
							 
						 
						
							
							
								
								Fix `DeprecationWarnings` found when running py.test in Python 2.7 with the -3 flag.  
							
							 
							
							... 
							
							
							
							Running through some of my tests with the `-3` flag in python2.7 I encountered some errors within py.test itself.  This fixes those errors so we can use py.test in order to identify problems with Python 3. 
							
						 
						
							2016-09-21 17:44:25 -07:00  
						
					 
				
					
						
							
							
								 
								Ahn Ki-Wook
							
						 
						
							 
							
							
							
							
								
							
							
								856ad719d3 
								
							 
						 
						
							
							
								
								Fix UnicodeEncodeError when string comparison with unicode has failed.  
							
							 
							
							
							
						 
						
							2016-08-26 09:41:40 +09:00  
						
					 
				
					
						
							
							
								 
								satoru
							
						 
						
							 
							
							
							
							
								
							
							
								3c8222f1db 
								
							 
						 
						
							
							
								
								Highlight the path of file location in error report  
							
							 
							
							... 
							
							
							
							So that it's more obvious when we need to copy the file path. 
							
						 
						
							2016-08-01 17:42:20 -03:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								d1852a48b7 
								
							 
						 
						
							
							
								
								Remove assertion reinterpretation  
							
							 
							
							... 
							
							
							
							The assertion reinterpretation is an old backwards compatibility
mode which was no longer being maintained on feature-parity with
the assertion rewriting mode.  It was also responsible for some
dubious patching of builtins and test with side-effects would
suddenly start passing.  Since re-writing has been the default for
a long time and plugins are now also re-written it is time to
retire reinterpretation. 
							
						 
						
							2016-07-15 00:33:39 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							 
							
							
							
						 
						
							2016-06-22 14:39:33 +02:00  
						
					 
				
					
						
							
							
								 
								marscher
							
						 
						
							 
							
							
							
							
								
							
							
								09d163aa3a 
								
							 
						 
						
							
							
								
								[exception handling] Fix case the current working directory (CWD) gets deleted during testing.  
							
							 
							
							... 
							
							
							
							Fixes  #1235 . 
							
						 
						
							2016-06-08 15:18:23 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								eab762ea99 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							 
							
							
							
						 
						
							2016-05-13 19:37:41 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								c49863aa63 
								
							 
						 
						
							
							
								
								merge next chunk from master and fix changelog linting issue  
							
							 
							
							
							
						 
						
							2016-05-13 19:36:47 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								aa87395c39 
								
							 
						 
						
							
							
								
								Use py.builtin.callable  
							
							 
							
							... 
							
							
							
							This restores compatibility with Python 3.0/3.1 
							
						 
						
							2016-04-20 11:18:47 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								75160547f2 
								
							 
						 
						
							
							
								
								Use a callable __tracebackhide__ for filtering  
							
							 
							
							... 
							
							
							
							While this leads to slightly more complicated user code for the common
case (checking if the exception is of a given type) it's easier to
implement and more flexible. 
							
						 
						
							2016-04-20 11:09:27 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								b607f6728f 
								
							 
						 
						
							
							
								
								Filter selectively with __tracebackhide__  
							
							 
							
							... 
							
							
							
							When __tracebackhide__ gets set to an exception type or list/tuple of
exception types, only those exceptions get filtered, while the full
traceback is shown if another exception (e.g. a bug in a assertion
helper) happens. 
							
						 
						
							2016-04-20 10:25:33 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								c24e8e01b4 
								
							 
						 
						
							
							
								
								Fix TracebackItem documentation in pytest.code  
							
							 
							
							... 
							
							
							
							The TracebackItem class does not exist, but it seems the docstrings refer to
TracebackEntry. 
							
						 
						
							2016-04-20 08:35:17 +02:00  
						
					 
				
					
						
							
							
								 
								Martin Prusse
							
						 
						
							 
							
							
							
							
								
							
							
								7ce5873da2 
								
							 
						 
						
							
							
								
								Perform a "unicode aware" check for maximum recursion depth error  
							
							 
							
							... 
							
							
							
							Avoid errors `UnicodeErrosr`s due non maximum recursion depth errors
when checking for those errors. 
							
						 
						
							2016-04-08 23:32:18 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								0f7aeafe7c 
								
							 
						 
						
							
							
								
								Merge pull request  #1486  from roolebo/fix-issue-138  
							
							 
							
							... 
							
							
							
							Fix issue #138  - support chained exceptions 
							
						 
						
							2016-04-03 19:21:57 +02:00  
						
					 
				
					
						
							
							
								 
								Omar Kohl
							
						 
						
							 
							
							
							
							
								
							
							
								c578226d43 
								
							 
						 
						
							
							
								
								Implement ExceptionInfo.match() to match regexp on str(exception)  
							
							 
							
							... 
							
							
							
							This implements similar functionality to
unittest.TestCase.assertRegexpMatches()
closes  #372  
							
						 
						
							2016-04-03 11:22:44 +02:00  
						
					 
				
					
						
							
							
								 
								Roman Bolshakov
							
						 
						
							 
							
							
							
							
								
							
							
								fbc5ba08d9 
								
							 
						 
						
							
							
								
								Fix issue  #138  
							
							 
							
							
							
						 
						
							2016-03-20 01:02:17 +03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7a6f902f6f 
								
							 
						 
						
							
							
								
								Drop assertionnew and assertionold from _pytest._code  
							
							 
							
							
							
						 
						
							2016-01-25 23:18:04 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							 
							
							... 
							
							
							
							Fix  #103  
							
						 
						
							2016-01-25 23:18:04 -02:00