tests/test-empty-dir.out

replace usage of os.popen() with util.popen()

To make this possible, I added a mode parameter to both implementations of
util.popen(), defaulting to 'r' (as it does in the Python stdlib).

321
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
sub/b not present
sub not present