P3K developer docs

larsmans · larsmans · commit eb56a35ee135 · 2013-02-10T21:13:17.000+01:00
diff --git a/doc/developers/index.rst b/doc/developers/index.rst
@@ -423,6 +423,24 @@ Here's a simple example of code using some of the above guidelines::
         return X[i]
 
 
+Python 3.x support
+------------------
+
+All scikit-learn code should work unchanged in both Python 2.[67]
+and 3.2 or newer. Since Python 3.x is not backwards compatible,
+that may require changes to code and it certainly requires testing
+on both 2.6 or 2.7, and 3.2 or newer.
+
+For most numerical algorithms, Python 3.x support is easy:
+just remember that ``print`` is a function and
+integer division is written ``//``.
+String handling has been overhauled, though, as have parts of
+the Python standard library.
+The `six <http://pythonhosted.org/six/>`_ package helps with
+cross-compability and is included in scikit-learn as
+``sklearn.externals.six``.
+
+
 APIs of scikit-learn objects
 ============================
 
diff --git a/doc/developers/utilities.rst b/doc/developers/utilities.rst
@@ -253,8 +253,8 @@ Testing Functions
 - :func:`testing.assert_raise_message`: Assertions for checking the
   error raise message.
 
-- :class:`mock_urllib2`: Object which mocks the urllib2 module to fake
-  requests of mldata.  Used in tests of :mod:`sklearn.datasets`.
+- :class:`UrlopenMock`: Object which mocks the urlopen function to fake
+  requests to mldata.org. Used in tests of :mod:`sklearn.datasets`.
 
 - :func:`testing.all_estimators` : returns a list of all estimators in
   sklearn to test for consistent behavior and interfaces.
