[py-svn] pylib commit 1fe1c8998862: * removed compat namespace

[commits-noreply at bitbucket.org]

# HG changeset patch -- Bitbucket.org
# Project pylib
# URL http://bitbucket.org/hpk42/pylib/overview
# User holger krekel <holger at merlinux.eu>
# Date 1290361189 -3600
# Node ID 1fe1c89988622791b4a9103eae97fdd45c21cb69
# Parent  52d3b11bd299c609a25fcf701a4a6bf132736a6a
* removed compat namespace
* some bug fixes wrt tmpdirs

--- a/py/_compat/dep_subprocess.py
+++ /dev/null
@@ -1,5 +0,0 @@
-
-import py
-py.log._apiwarn("1.1", "py.compat.subprocess deprecated, use standard library version.",
-stacklevel="apipkg")
-subprocess = py.std.subprocess

--- a/testing/root/test_com.py
+++ /dev/null
@@ -1,3 +0,0 @@
-
-import py
-import os

--- a/py/__init__.py
+++ b/py/__init__.py
@@ -140,12 +140,4 @@ _apipkg.initpkg(__name__, attr={'_apipkg
         'Syslog'             : '._log.log:Syslog',
     },
 
-    # compatibility modules (deprecated)
-    'compat' : {
-        '__doc__'         : '._compat:__doc__',
-        'doctest'         : '._compat.dep_doctest:doctest',
-        'optparse'        : '._compat.dep_optparse:optparse',
-        'textwrap'        : '._compat.dep_textwrap:textwrap',
-        'subprocess'      : '._compat.dep_subprocess:subprocess',
-    },
 })

--- a/py/_compat/dep_doctest.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import py
-
-py.log._apiwarn("1.1", "py.compat.doctest deprecated, use standard library version.",
-stacklevel="apipkg")
-doctest = py.std.doctest

--- a/py/_compat/dep_optparse.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import py
-py.log._apiwarn("1.1", "py.compat.optparse deprecated, use standard library version.", stacklevel="apipkg")
-
-optparse = py.std.optparse

--- a/testing/path/test_local.py
+++ b/testing/path/test_local.py
@@ -14,7 +14,7 @@ skiponwin32 = py.test.mark.skipif(
 
 def pytest_funcarg__path1(request):
     def setup():
-        path1 = request.config.mktemp("path1")
+        path1 = request.getfuncargvalue("tmpdir")
         common.setuptestfs(path1)
         return path1
     def teardown(path1):

--- a/testing/code/test_source.py
+++ b/testing/code/test_source.py
@@ -348,7 +348,8 @@ def test_deindent():
     lines = deindent(source.splitlines())
     assert lines == ['', 'def f():', '    def g():', '        pass', '    ']
 
- at py.test.mark.xfail("sys.version_info[:2] != (2,7) and sys.version_info[:2]<(3,2)")
+ at py.test.mark.xfail("sys.version_info[:3] < (2,6,5) or "
+    "((3,0) <= sys.version_info[:2] < (3,2))")
 def test_source_of_class_at_eof_without_newline(tmpdir):
     # this test fails because the implicit inspect.getsource(A) below
     # does not return the "x = 1" last line.

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ Changes between 1.3.4 and 2.0.0dev0
 - path objects have a .dirname attribute now (equivalent to
   os.path.dirname(path))
 - path.visit() accepts breadthfirst (bf) and sort options
+- remove deprecated py.compat namespace
 
 Changes between 1.3.3 and 1.3.4
 ==================================================

--- a/tox.ini
+++ b/tox.ini
@@ -23,3 +23,4 @@ commands=
 
 [pytest]
 rsyncdirs = conftest.py py doc testing
+addopts = -rxXf

--- a/py/_compat/dep_textwrap.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import py
-
-py.log._apiwarn("1.1", "py.compat.textwrap deprecated, use standard library version.",
-    stacklevel="apipkg")
-textwrap = py.std.textwrap

--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,6 @@ def main():
                      'Programming Language :: Python :: 3'],
         packages=['py',
                   'py._code',
-                  'py._compat',
                   'py._io',
                   'py._log',
                   'py._path',

--- a/py/_compat/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-""" compatibility modules (taken from 2.4.4) """
-