make py lib a self-contained directory again

- move and merge _py/ bits back to py/
- fixes all around

--HG--
branch : trunk

testing/path/conftest.py

@@ -1,5 +1,5 @@
 import py
-from _py.path import svnwc as svncommon
+from py.impl.path import svnwc as svncommon
 
 svnbin = py.path.local.sysfind('svn')
 repodump = py.path.local(__file__).dirpath('repotest.dump')

testing/path/svntestbase.py

@@ -1,6 +1,6 @@
 import sys
 import py
-from _py.path import svnwc as svncommon
+from py.impl.path import svnwc as svncommon
 from testing.path.common import CommonFSTests
 
 class CommonSvnTests(CommonFSTests):

testing/path/test_cacheutil.py

@@ -1,5 +1,5 @@
 import py
-from _py.path import cacheutil 
+from py.impl.path import cacheutil 
 
 class BasicCacheAPITest:
     cache = None

testing/path/test_svnurl.py

@@ -1,5 +1,5 @@
 import py
-from _py.path.svnurl import InfoSvnCommand
+from py.impl.path.svnurl import InfoSvnCommand
 import datetime
 import time
 from testing.path.svntestbase import CommonSvnTests

testing/path/test_svnwc.py

@@ -1,7 +1,7 @@
 import py
 import sys
-from _py.path.svnwc import InfoSvnWCCommand, XMLWCStatus, parse_wcinfotime
-from _py.path import svnwc as svncommon
+from py.impl.path.svnwc import InfoSvnWCCommand, XMLWCStatus, parse_wcinfotime
+from py.impl.path import svnwc as svncommon
 from testing.path.svntestbase import CommonSvnTests
 
 if sys.platform == 'win32':