python: 'cv2.' -> 'cv.' via 'import cv2 as cv'

modules/python/test/tests_common.py

@@ -10,7 +10,7 @@ import random
 import argparse
 
 import numpy as np
-import cv2
+import cv2 as cv
 
 # Python 3 moved urlopen to urllib.requests
 try:
@@ -26,7 +26,7 @@ class NewOpenCVTests(unittest.TestCase):
     # github repository url
     repoUrl = 'https://raw.github.com/opencv/opencv/master'
 
-    def get_sample(self, filename, iscolor = cv2.IMREAD_COLOR):
+    def get_sample(self, filename, iscolor = cv.IMREAD_COLOR):
         if not filename in self.image_cache:
             filedata = None
             if NewOpenCVTests.repoPath is not None:
@@ -41,11 +41,11 @@ class NewOpenCVTests(unittest.TestCase):
                         filedata = f.read()
             if filedata is None:
                 return None#filedata = urlopen(NewOpenCVTests.repoUrl + '/' + filename).read()
-            self.image_cache[filename] = cv2.imdecode(np.fromstring(filedata, dtype=np.uint8), iscolor)
+            self.image_cache[filename] = cv.imdecode(np.fromstring(filedata, dtype=np.uint8), iscolor)
         return self.image_cache[filename]
 
     def setUp(self):
-        cv2.setRNGSeed(10)
+        cv.setRNGSeed(10)
         self.image_cache = {}
 
     def hashimg(self, im):
@@ -73,7 +73,7 @@ class NewOpenCVTests(unittest.TestCase):
         parser.add_argument('--data', help='<not used> use data files from local folder (path to folder), '
                                             'if not set, data files will be downloaded from docs.opencv.org')
         args, other = parser.parse_known_args()
-        print("Testing OpenCV", cv2.__version__)
+        print("Testing OpenCV", cv.__version__)
         print("Local repo path:", args.repo)
         NewOpenCVTests.repoPath = args.repo
         try:
@@ -93,8 +93,8 @@ def intersectionRate(s1, s2):
     x1, y1, x2, y2 = s2
     s2 = np.array([[x1, y1], [x2,y1], [x2, y2], [x1, y2]])
 
-    area, _intersection = cv2.intersectConvexConvex(s1, s2)
-    return 2 * area / (cv2.contourArea(s1) + cv2.contourArea(s2))
+    area, _intersection = cv.intersectConvexConvex(s1, s2)
+    return 2 * area / (cv.contourArea(s1) + cv.contourArea(s2))
 
 def isPointInRect(p, rect):
     if rect[0] <= p[0] and rect[1] <=p[1] and p[0] <= rect[2] and p[1] <= rect[3]: