holger krekel committed 7fe4418

fix py31 compat, amend long description

Comments (0)

Files changed (2)

 def call_optional(obj, name):
     method = getattr(obj, name, None)
-    if method is not None and not hasattr(method, "_pytestfixturefunction") and callable(method):
+    if method is not None and not hasattr(method, "_pytestfixturefunction") and py.builtin.callable(method):
         # If there's any problems allow the exception to raise rather than
         # silently ignoring them
     from setuptools import setup, Command
 long_description = """
-cross-project testing tool for Python.
+The `py.test`` testing tool makes it easy to write small tests, yet
+scales to support complex functional testing.  It provides
-Platforms: Linux, Win32, OSX
+- `auto-discovery
+  <>`_
+  of test modules and functions,
+- detailed info on failing `assert statements <>`_ (no need to remember ``self.assert*`` names)
+- `modular fixtures <>`_  for
+  managing small or parametrized long-lived test resources.
+- multi-paradigm support: you can use ``py.test`` to run test suites based
+  on `unittest <>`_ (or trial),
+  `nose <>`_
+- single-source compatibility to Python2.4 all the way up to Python3.3,
+  PyPy and Jython.
-Interpreters: Python versions 2.4 through to 3.3, Jython 2.5.1 and PyPy-1.9
+- many `external plugins <>`_.
-Bugs and issues:
+A simple example for a test::
-Web page:
+    # content of
+    def test_function():
+        i = 4
+        assert i == 3
+which can be run with ``py.test``.  See `getting-started <>`_ for more examples.
+For much more info, including PDF docs, see
+and report bugs at:
 (c) Holger Krekel and others, 2004-2012