cp -rf Python-2.7.10/Modules/_multiprocessing Modules/_multiprocessig
cp -rf Python-2.7.10/Lib/multiprocessing multiprocessing
cp -rf Python-2.7.10/Lib/test/test_multiprocessing.py tests/__init__.py
cp -rf py2.5.6/examples .
cp -f py2.5.6/*txt .
cp -f billiard-3.3.0.20/setup.py .
cp -rf py2.5.6/doc .
cp -f py2.5.6/index.html .

# ----------------------------------------------------------------------
CHANGES TO setup.py:
  HACKED billiard's setup.py together with processing's setup.py

CHANGES TO examples:
  updated from old (processing) to new (multiprocessing) methods
# ----------------------------------------------------------------------
diff Modules/_multiprocessing/semaphore.c Python-2.7.10/Modules/_multiprocessing/semaphore.c
211c211
< //ifndef HAVE_SEM_TIMEDWAIT
---
> #ifndef HAVE_SEM_TIMEDWAIT
272c272
< //endif /* !HAVE_SEM_TIMEDWAIT */
---
> #endif /* !HAVE_SEM_TIMEDWAIT */

# ----------------------------------------------------------------------
diff multiprocessing/__init__.py Python-2.7.10/Lib/multiprocessing/__init__.py
44c44
< __version__ = '0.70.1'
---
> __version__ = '0.70a1'

diff tests/__init__.py Python-2.7.10/Lib/test/test_multiprocessing.py 
2474c2474
<     def _test_noforkbomb(self):
---
>     def test_noforkbomb(self):

diff multiprocessing/forking.py Python-2.7.10/Lib/multiprocessing/forking.py
59,62c59
< try:
<     from dill import Pickler
< except ImportError:
<     from pickle import Pickler
---
> from pickle import Pickler
196,200c193,196
<     try:
<     #   from cPickle import dump, load, HIGHEST_PROTOCOL
<         from dill import load, DEFAULT_PROTOCOL as HIGHEST_PROTOCOL
<     except ImportError:
<         from pickle import load, HIGHEST_PROTOCOL
---
>     #try:
>     #    from cPickle import dump, load, HIGHEST_PROTOCOL
>     #except ImportError:
>     from pickle import load, HIGHEST_PROTOCOL

diff multiprocessing/managers.py Python-2.7.10/Lib/multiprocessing/managers.py
56c56
<     from dill import PicklingError
---
>     from cPickle import PicklingError
58,61c58
<     try:
<         from cPickle import PicklingError
<     except ImportError:
<         from pickle import PicklingError
---
>     from pickle import PicklingError

diff Modules/_multiprocessing/multiprocessing.c Python-2.7.10/Modules/_multiprocessing/multiprocessing.c
255,257c255
<     temp = PyImport_ImportModule("dill");
<     if (!temp)
<         temp = PyImport_ImportModule(PICKLE_MODULE);
---
>     temp = PyImport_ImportModule(PICKLE_MODULE);
262,264c260
<     pickle_protocol = PyObject_GetAttrString(temp, "DEFAULT_PROTOCOL");
<     if (!pickle_protocol)
<         pickle_protocol = PyObject_GetAttrString(temp, "HIGHEST_PROTOCOL");
---
>     pickle_protocol = PyObject_GetAttrString(temp, "HIGHEST_PROTOCOL");
