1. 07 Aug, 2014 4 commits
    • arc's avatar
      Merge branch 'master' into python2and3 · 3d0a270a
      arc authored
      3d0a270a
    • Michael Pratt's avatar
      Support Python 2 and 3 in test script · e9ccadeb
      Michael Pratt authored
      Add Python 3 support to the Python test.py script.
      
      The print function is used in place of the print statement.
      
      The urlopen function has been moved to urllib.request in Python 3, so
      attempt to import it from either location.
      
      TestCase.assert_() has been deprecated in place of
      TestCase.assertTrue().
      
      The tests all pass in both Python 2 and 3.
      e9ccadeb
    • Michael Pratt's avatar
      Build Python 3 bindings in subdirectory · 7d41ce23
      Michael Pratt authored
      Build the Python 3 cv2 module in lib/python3/, to avoid potential naming
      conflicts with the Python 2 bindings.
      
      The Python 2 bindings are placed directly in lib/, where they are
      required for the Buildbot to successfully execute the Python tests.
      7d41ce23
    • Michael Pratt's avatar
      Add opencv_matlab to Python ignored modules · d921cde4
      Michael Pratt authored
      Requested by @vpisarev in #3047.
      d921cde4
  2. 06 Aug, 2014 7 commits
  3. 05 Aug, 2014 11 commits
  4. 04 Aug, 2014 10 commits
  5. 03 Aug, 2014 7 commits
  6. 02 Aug, 2014 1 commit