Fix backwards compatability

imutils/video/videostream.py

@@ -3,7 +3,7 @@
 
 class VideoStream:
 	def __init__(self, src=0, usePiCamera=False, resolution=(320, 240),
-		framerate=32, **kwargs, cap=None):
+		framerate=32, **kwargs):
 		# check to see if the picamera module should be used
 		if usePiCamera:
 			# only import the picamera packages unless we are
@@ -17,11 +17,9 @@ def __init__(self, src=0, usePiCamera=False, resolution=(320, 240),
 			self.stream = PiVideoStream(resolution=resolution,
 				framerate=framerate, **kwargs)
 
-		# otherwise, we are using OpenCV so initialize the webcam
-		# stream
+		# otherwise, we are using OpenCV so initialize the webcam stream
 		else:
-			self.stream = WebcamVideoStream(src=src, cap=cap,
-				resolution=resolution)
+			self.stream = WebcamVideoStream(src=src, resolution=resolution)
 
 	def start(self):
 		# start the threaded video stream

imutils/video/webcamvideostream.py

@@ -3,15 +3,16 @@
 import cv2
 
 class WebcamVideoStream:
-	def __init__(self, src=0, cap=None, resolution=(320, 240),
-		name="WebcamVideoStream"):
-		# initialize the video camera stream and read the first frame
-		# from the stream
-		self.stream = cap
-		if cap is None:
+	def __init__(self, src=0, resolution=(320, 240), name="WebcamVideoStream"):
+		# initialize the video camera stream
+		if isinstance(src, int):
 			self.stream = cv2.VideoCapture(src)
 			self.stream.set(3, int(resolution[0]))  # cv2.CAP_PROP_FRAME_WIDTH
 			self.stream.set(4, int(resolution[1]))  # cv2.CAP_PROP_FRAME_HEIGHT
+		else:
+			self.stream = src
+
+		# read the first frame from the stream
 		(self.grabbed, self.frame) = self.stream.read()
 
 		# initialize the thread name