[MERGE] init remote branches

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> With our os-specific functions (like getcwd()) if we only import the
> osutils module, then we can actually hijack the specific implementation
> in the test suite, to make sure that the rest of the codebase does the
> right thing.

I don't understand this.  It sounds like you're talking about directly
invoking osutils.get_cwd, or os.get_cwd, and I agree that when you want
to use both, it often makes sense to use the module name to distinguish
functions.  But that doesn't sound like 'hijacking' to me, so I must be
missing something.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD4DBQFEqEmZ0F+nu1YWqI0RAs4LAJ0YuI+7dVWrV+/HjSmCKWvbvg7FLgCYkfpK
tPVFlWs5pMb509KyD/RbkA==
=0TNr
-----END PGP SIGNATURE-----