Updating first edition (Cameo) code for Python 3 compatibility

techfort · Apr 27, 2019 · 50a7b60 · 50a7b60
1 parent a2bb227
commit 50a7b60
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/first_edition/appendix/cameo/managers.py b/first_edition/appendix/cameo/managers.py
@@ -23,7 +23,7 @@ def __init__(self, capture, previewWindowManager = None,
         self._videoWriter = None
 
         self._startTime = None
-        self._framesElapsed = long(0)
+        self._framesElapsed = 0
         self._fpsEstimate = None
 
     @property

diff --git a/first_edition/chapter2/cameo/managers.py b/first_edition/chapter2/cameo/managers.py
@@ -21,7 +21,7 @@ def __init__(self, capture, previewWindowManager = None,
         self._videoWriter = None
 
         self._startTime = None
-        self._framesElapsed = long(0)
+        self._framesElapsed = 0
         self._fpsEstimate = None
 
     @property

diff --git a/first_edition/chapter3/cameo/managers.py b/first_edition/chapter3/cameo/managers.py
@@ -21,7 +21,7 @@ def __init__(self, capture, previewWindowManager = None,
         self._videoWriter = None
 
         self._startTime = None
-        self._framesElapsed = long(0)
+        self._framesElapsed = 0
         self._fpsEstimate = None
 
     @property

diff --git a/first_edition/chapter4/cameo/managers.py b/first_edition/chapter4/cameo/managers.py
@@ -21,7 +21,7 @@ def __init__(self, capture, previewWindowManager = None,
         self._videoWriter = None
 
         self._startTime = None
-        self._framesElapsed = long(0)
+        self._framesElapsed = 0
         self._fpsEstimate = None
 
     @property

diff --git a/first_edition/chapter4/cameo/trackers.py b/first_edition/chapter4/cameo/trackers.py
@@ -65,22 +65,22 @@ def update(self, image):
                 x, y, w, h = faceRect
 
                 # Seek an eye in the upper-left part of the face.
-                searchRect = (x+w/7, y, w*2/7, h/2)
+                searchRect = (x+w//7, y, w*2//7, h//2)
                 face.leftEyeRect = self._detectOneObject(
                     self._eyeClassifier, image, searchRect, 64)
 
                 # Seek an eye in the upper-right part of the face.
-                searchRect = (x+w*4/7, y, w*2/7, h/2)
+                searchRect = (x+w*4//7, y, w*2//7, h//2)
                 face.rightEyeRect = self._detectOneObject(
                     self._eyeClassifier, image, searchRect, 64)
 
                 # Seek a nose in the middle part of the face.
-                searchRect = (x+w/4, y+h/4, w/2, h/2)
+                searchRect = (x+w//4, y+h//4, w//2, h//2)
                 face.noseRect = self._detectOneObject(
                     self._noseClassifier, image, searchRect, 32)
 
                 # Seek a mouth in the lower-middle part of the face.
-                searchRect = (x+w/6, y+h*2/3, w*2/3, h/3)
+                searchRect = (x+w//6, y+h*2//3, w*2//3, h//3)
                 face.mouthRect = self._detectOneObject(
                     self._mouthClassifier, image, searchRect, 16)
 

diff --git a/first_edition/chapter4/cameo/utils.py b/first_edition/chapter4/cameo/utils.py
@@ -61,4 +61,4 @@ def isGray(image):
 def widthHeightDividedBy(image, divisor):
     """Return an image's dimensions, divided by a value."""
     h, w = image.shape[:2]
-    return (w/divisor, h/divisor)
+    return (w//divisor, h//divisor)
diff --git a/first_edition/chapter5/cameo/managers.py b/first_edition/chapter5/cameo/managers.py
@@ -21,7 +21,7 @@ def __init__(self, capture, previewWindowManager = None,
         self._videoWriter = None
 
         self._startTime = None
-        self._framesElapsed = long(0)
+        self._framesElapsed = 0
         self._fpsEstimate = None
 
     @property