Merge remote-tracking branch 'upstream/3.4' into merge-3.4

modules/dnn/misc/python/pyopencv_dnn.hpp

@@ -71,6 +71,12 @@ PyObject* pyopencv_from(const dnn::LayerParams& lp)
     return dict;
 }
 
+template<>
+PyObject* pyopencv_from(const std::vector<dnn::Target> &t)
+{
+    return pyopencv_from(std::vector<int>(t.begin(), t.end()));
+}
+
 class pycvLayer CV_FINAL : public dnn::Layer
 {
 public:

modules/dnn/misc/python/test/test_dnn.py

@@ -117,6 +117,10 @@ class dnn_test(NewOpenCVTests):
             return False
         return True
 
+    def test_getAvailableTargets(self):
+        targets = cv.dnn.getAvailableTargets(cv.dnn.DNN_BACKEND_OPENCV)
+        self.assertTrue(cv.dnn.DNN_TARGET_CPU in targets)
+
     def test_blobFromImage(self):
         np.random.seed(324)