Bruno Oliveira 5fcce8a7d6 Merge branch 'master' into merge-master-into-features

2016-03-18 18:26:56 -03:00

..

approx.py

Fix Decimal() and __ne__() errors.

2016-03-11 16:29:18 -08:00

collect.py

Fix decoding issue while formatting SyntaxErrors during collection

2016-03-05 16:58:50 -03:00

fixture.py

Allow custom fixture names for fixtures

2016-03-09 14:58:54 -08:00

integration.py

Moved py.code code over to py.test

2016-01-25 23:18:04 -02:00

metafunc.py

When a regex pattern contains bytes instead of a string use escape_encode to turn it into a string before further processing. Thanks @nicoddemus for the review and tips!

2016-03-05 21:04:34 -05:00

raises.py

Add expected exceptions to 'DID NOT RAISE' msg

2016-02-03 14:12:41 +03:00