[Checkins] [zopefoundation/zodbpickle] 054088: fix small merging bug in 2.7 version where gcc com...

Mon Jul 15 15:15:04 CEST 2013

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/zodbpickle
  Commit: 054088eb99bab08fb7f3d0cb61df35e2fc92a14e
      https://github.com/zopefoundation/zodbpickle/commit/054088eb99bab08fb7f3d0cb61df35e2fc92a14e
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M src/zodbpickle/_pickle_27.c

  Log Message:
  -----------
  fix small merging bug in 2.7 version where gcc complains (OS X)

  Commit: 0f91bb88c650eba2c6a03bb6cfa48ef95d1a5e90
      https://github.com/zopefoundation/zodbpickle/commit/0f91bb88c650eba2c6a03bb6cfa48ef95d1a5e90
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M src/zodbpickle/pickle_3.py

  Log Message:
  -----------
  merged the new 3.3 python version. (needs testing)

  Commit: d57a87356890d9805d915646b882ca5aae91384e
      https://github.com/zopefoundation/zodbpickle/commit/d57a87356890d9805d915646b882ca5aae91384e
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M src/zodbpickle/pickle_2.py

  Log Message:
  -----------
  merged the new 2.7.5 python version. Very tiny.
Still not clear why the added globals do not appear.

  Commit: 3af5606b78aaa1032d64e5a69d145fdc7c0f44e3
      https://github.com/zopefoundation/zodbpickle/commit/3af5606b78aaa1032d64e5a69d145fdc7c0f44e3
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M src/zodbpickle/pickle.py
    M src/zodbpickle/pickle_3.py

  Log Message:
  -----------
  most complete compatibility by using the __all__ from the imported modules

  Commit: 86d14808701fd668e7759b4695bea84e7db12717
      https://github.com/zopefoundation/zodbpickle/commit/86d14808701fd668e7759b4695bea84e7db12717
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M src/zodbpickle/_pickle_27.c

  Log Message:
  -----------
  fix small merging bug in 2.7 version where gcc complains (OS X)

  Commit: 6608346a4061c7e1656a603333d2e498afea255e
      https://github.com/zopefoundation/zodbpickle/commit/6608346a4061c7e1656a603333d2e498afea255e
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M src/zodbpickle/pickle_2.py

  Log Message:
  -----------
  apply 2.7.5 changes

  Commit: 11dbf1cd7c4414083ddd42129278abb78935f433
      https://github.com/zopefoundation/zodbpickle/commit/11dbf1cd7c4414083ddd42129278abb78935f433
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M src/zodbpickle/pickle_3.py

  Log Message:
  -----------
  apply 3.3.2 changes

  Commit: b6518a7445ef6fb198ed2e15b99aa05b5c72021c
      https://github.com/zopefoundation/zodbpickle/commit/b6518a7445ef6fb198ed2e15b99aa05b5c72021c
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M src/zodbpickle/pickle.py
    M src/zodbpickle/pickle_3.py

  Log Message:
  -----------
  make the interface as compatible as possible

  Commit: 87fea0aaef588f20aad6809e38f71160aac48f28
      https://github.com/zopefoundation/zodbpickle/commit/87fea0aaef588f20aad6809e38f71160aac48f28
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  modify doap record to reflect changes

  Commit: 42150635be20d8f87ce285d3439378b040ea409c
      https://github.com/zopefoundation/zodbpickle/commit/42150635be20d8f87ce285d3439378b040ea409c
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M src/zodbpickle/_pickle_27.c
    M src/zodbpickle/tests/pickletester_2.py
    M src/zodbpickle/tests/test_pickle_2.py

  Log Message:
  -----------
  update C source and tests

  Commit: e3e28ccadf27843cc7ea2438b2ea53b53033d715
      https://github.com/zopefoundation/zodbpickle/commit/e3e28ccadf27843cc7ea2438b2ea53b53033d715
  Author: Tres Seaver <tseaver at palladion.com>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M src/zodbpickle/tests/pickletester_2.py

  Log Message:
  -----------
  make tests work in 2.6, patch from Tres

  Commit: c879e8a16fd154ffd6c734adac1f8a4366586bb0
      https://github.com/zopefoundation/zodbpickle/commit/c879e8a16fd154ffd6c734adac1f8a4366586bb0
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M src/zodbpickle/_pickle_33.c
    M src/zodbpickle/tests/pickletester_3.py
    M src/zodbpickle/tests/test_pickle_3.py

  Log Message:
  -----------
  update C source and tests for 3.3.2

  Commit: 56231eb702af48e0af7774fb4b4b1f8d975e4220
      https://github.com/zopefoundation/zodbpickle/commit/56231eb702af48e0af7774fb4b4b1f8d975e4220
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M src/zodbpickle/_pickle_33.c
    M src/zodbpickle/tests/pickletester_3.py
    M src/zodbpickle/tests/test_pickle_3.py

  Log Message:
  -----------
  Merge branch 'tests_332'

* tests_332:
  update C source and tests for 3.3.2

  Commit: 58ac0190f3105f1b7b55500b37ea185a8d1370a2
      https://github.com/zopefoundation/zodbpickle/commit/58ac0190f3105f1b7b55500b37ea185a8d1370a2
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M src/zodbpickle/_pickle_32.c

  Log Message:
  -----------
  update C source and tests for 3.2.5 .
Actually, the issue #17710 fixes have not been back-ported to 3.2.5, but I did it, because the tests are from 3.3.2

  Commit: 349c1ad634b42d996fb1aaf9592105155c92b4cd
      https://github.com/zopefoundation/zodbpickle/commit/349c1ad634b42d996fb1aaf9592105155c92b4cd
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-06 (Sat, 06 Jul 2013)

  Changed paths:
    M src/zodbpickle/pickletools_2.py
    M src/zodbpickle/pickletools_3.py

  Log Message:
  -----------
  update pickle tools and make tests work

  Commit: 5431833aa944498661ca61fe219f47bca752b676
      https://github.com/zopefoundation/zodbpickle/commit/5431833aa944498661ca61fe219f47bca752b676
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-06 (Sat, 06 Jul 2013)

  Changed paths:
    M src/zodbpickle/pickle_2.py
    M src/zodbpickle/tests/test_pickle_2.py

  Log Message:
  -----------
  rework all tests to become complete (pickle and cpickle 2.7.5)

  Commit: 6db2fc49543da6893ecee98d66b98e64f03d97ba
      https://github.com/zopefoundation/zodbpickle/commit/6db2fc49543da6893ecee98d66b98e64f03d97ba
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-06 (Sat, 06 Jul 2013)

  Changed paths:
    M src/zodbpickle/pickle_2.py
    M src/zodbpickle/tests/test_pickle_2.py

  Log Message:
  -----------
  Merge branch 'tests_275'

* tests_275:
  rework all tests to become complete (pickle and cpickle 2.7.5)

  Commit: 0049a454c204f60d4c54449e20cf809e902d2620
      https://github.com/zopefoundation/zodbpickle/commit/0049a454c204f60d4c54449e20cf809e902d2620
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-06 (Sat, 06 Jul 2013)

  Changed paths:
    A src/zodbpickle/fastpickle.py
    M src/zodbpickle/pickle.py
    M src/zodbpickle/pickle_3.py
    A src/zodbpickle/slowpickle.py

  Log Message:
  -----------
  add fastpickle and slowpickle modules

This way the selection of the Python or C impl is independent from the Python version.

  Commit: 32de3658be1536635b65399fb17fe24af74f013a
      https://github.com/zopefoundation/zodbpickle/commit/32de3658be1536635b65399fb17fe24af74f013a
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-06 (Sat, 06 Jul 2013)

  Changed paths:
    M CHANGES.rst
    M README.rst

  Log Message:
  -----------
  Prep 0.5.1 release.

  Commit: e1f97f137b19a69d76ac61874e82803e0a6b888c
      https://github.com/zopefoundation/zodbpickle/commit/e1f97f137b19a69d76ac61874e82803e0a6b888c
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-06 (Sat, 06 Jul 2013)

  Changed paths:
    M README.rst
    M src/zodbpickle/fastpickle.py
    M src/zodbpickle/slowpickle.py

  Log Message:
  -----------
  make slowpickle and fastpickle independent.

It is now possible to do

    from zodbpickle import slowpickle, fastpickle

without interference. This feature would be useful in cpyhon's pickle as well.

  Commit: 856ee62eb9e1314476a1d4dba06339dd58338d5b
      https://github.com/zopefoundation/zodbpickle/commit/856ee62eb9e1314476a1d4dba06339dd58338d5b
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M CHANGES.rst
    M README.rst
    M setup.py
    M src/zodbpickle/_pickle_27.c
    M src/zodbpickle/_pickle_32.c
    M src/zodbpickle/_pickle_33.c
    A src/zodbpickle/fastpickle.py
    M src/zodbpickle/pickle_2.py
    M src/zodbpickle/pickle_3.py
    M src/zodbpickle/pickletools_2.py
    M src/zodbpickle/pickletools_3.py
    A src/zodbpickle/slowpickle.py
    M src/zodbpickle/tests/pickletester_2.py
    M src/zodbpickle/tests/pickletester_3.py
    M src/zodbpickle/tests/test_pickle_2.py
    M src/zodbpickle/tests/test_pickle_3.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/ctismer/zodbpickle

  Commit: 1462ee37372c08838c108577476c6547b89cb692
      https://github.com/zopefoundation/zodbpickle/commit/1462ee37372c08838c108577476c6547b89cb692
  Author: Christian Tismer <tismer at stackless.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M bootstrap.py
    M buildout.cfg

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/zopefoundation/zodbpickle

  Commit: 8014fbf78ec42886117793218f6c531999b1de22
      https://github.com/zopefoundation/zodbpickle/commit/8014fbf78ec42886117793218f6c531999b1de22
  Author: Stephan Richter <stephan.richter at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M CHANGES.rst
    M README.rst
    M setup.py
    M src/zodbpickle/_pickle_27.c
    M src/zodbpickle/_pickle_32.c
    M src/zodbpickle/_pickle_33.c
    A src/zodbpickle/fastpickle.py
    M src/zodbpickle/pickle.py
    M src/zodbpickle/pickle_2.py
    M src/zodbpickle/pickle_3.py
    M src/zodbpickle/pickletools_2.py
    M src/zodbpickle/pickletools_3.py
    A src/zodbpickle/slowpickle.py
    M src/zodbpickle/tests/pickletester_2.py
    M src/zodbpickle/tests/pickletester_3.py
    M src/zodbpickle/tests/test_pickle_2.py
    M src/zodbpickle/tests/test_pickle_3.py

  Log Message:
  -----------
  Merge pull request #4 from ctismer/master

Originally, this fixes a small merge glitch that prevents OS X from building.

But in the end, I worked on a lot more:

- update the Python and C files to include all 2.6.8 and 2.7.5 changes
- update the Python and C files to include all 3.2.5 and 3.3.2 changes
- rework the 2.X tests to be a complete merge of pickle and cPickle tests
- update the DOAP record to 0.5.1 and mention OS X
- added fastpickle and slowpickle modules to give the user a simpler choice

Compare: https://github.com/zopefoundation/zodbpickle/compare/d86cb0eccc29...8014fbf78ec4