|  wanghui | d7a5c5716f | Add UnicodeWarning for unicode warnings in Python2 | 2017-05-26 13:12:02 +08: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 | a542ed48a2 | Convert using utf-8 instead of ascii in safe_str() This way we don't lose information and the returned string is
ascii-compatible anyway | 2017-03-29 15:18:41 -03:00 | 
				
					
						|  Bruno Oliveira | 58ac4faf0c | Fix exception formatting while importing test modules Fix #2336 | 2017-03-29 14:43:13 -03:00 | 
				
					
						|  Ronny Pfannschmidt | 92f6ab1881 | fix all singular internal module imports and add a test for them | 2017-03-28 11:45:06 +02:00 | 
				
					
						|  Ronny Pfannschmidt | 9b58d6eaca | prepare a own pytest.collect fake module in oder to remove the nested builtin namespaces | 2017-03-28 11:45:06 +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 | 
				
					
						|  Anthony Sottile | 6ba3475448 | Make capsys more like stdio streams in python3.  Resolves #1407. | 2017-02-23 17:46:27 -08:00 | 
				
					
						|  Ronny Pfannschmidt | 250597d468 | get_real_func: use saferepr when formatting the error message | 2017-01-19 13:05:58 +01:00 | 
				
					
						|  Ronny Pfannschmidt | 123289a88e | fixes #2208 by introducing a iteration limit | 2017-01-19 11:38:15 +01:00 | 
				
					
						|  Bruno Oliveira | 402fbe503a | Merge branch 'master' into merge-master-into-features | 2016-12-27 23:31:26 -02:00 | 
				
					
						|  Bruno Oliveira | 091148f843 | Merge pull request #2136 from hroncok/i2132 Tests: Check for ModuleNotFoundError on Python 3.6+ | 2016-12-27 23:10:58 -02:00 | 
				
					
						|  Bruno Oliveira | 515fb09995 | Move module error compatibility code to _pytest.compat | 2016-12-27 22:01:22 -02:00 | 
				
					
						|  Bruno Oliveira | caee5ce489 | Avoid importing asyncio directly because that in turn initializes logging (#8) | 2016-12-13 21:54:20 -02:00 | 
				
					
						|  Dmitry Malinovsky | 3a59acf69f | Use inspect to properly detect generators. Fixes #2129 | 2016-12-11 21:59:11 +06:00 | 
				
					
						|  Luke Murphy | f5afd8cb54 | Add missing `__test__` check for test discovery. | 2016-11-30 17:05:42 +01:00 | 
				
					
						|  Bruno Oliveira | 9d00615bbf | Merge remote-tracking branch 'upstream/master' into merge-master-into-features | 2016-10-20 21:51:42 -02:00 | 
				
					
						|  Bruno Oliveira | 78eec0d7f8 | Handle import errors with non-ascii messages when importing plugins Fix #1998 | 2016-10-12 18:19:32 -03:00 | 
				
					
						|  Ronny Pfannschmidt | 45524241a5 | mark: fix introduced linting error | 2016-09-08 10:16:45 +02:00 | 
				
					
						|  Ronny Pfannschmidt | 1812387bf0 | Mark: fix python 3 compatibility | 2016-09-08 10:03:45 +02:00 | 
				
					
						|  Bruno Oliveira | 66673c0dd3 | Remove obsolete docstring | 2016-08-17 22:59:18 -03:00 | 
				
					
						|  Bruno Oliveira | 3ba475c0f2 | Move internal _is_unittest_unexpected_success_a_failure to "compat" module Fix #1815 | 2016-08-17 22:50:10 -03:00 | 
				
					
						|  Ronny Pfannschmidt | 8c49561470 | split most fixture related code into own plugin | 2016-07-09 20:36:00 +02:00 |