merge

_pytest/assertion/rewrite.py

@@ -1,7 +1,6 @@
 """Rewrite assertion AST to produce nice error messages"""
 
 import ast
-import collections
 import errno
 import itertools
 import imp

doc/usage.txt

@@ -70,7 +70,7 @@ Dropping to PDB (Python Debugger) on failures
 .. _PDB: http://docs.python.org/library/pdb.html
 
 Python comes with a builtin Python debugger called PDB_.  ``py.test``
-allows to drop into the PDB prompt via a command line option::
+allows one to drop into the PDB prompt via a command line option::
 
     py.test --pdb