Fixes for python 3

yowsup/common/tools.py

@@ -212,38 +212,38 @@ def getExtension(mimetype):
 
 
 class VideoTools:
-	
-	@staticmethod
-	def getVideoProperties(videoFile):
-		if ModuleTools.INSTALLED_FFVIDEO():
-			from ffvideo import VideoStream
-			s = VideoStream(videoFile)
-			return s.width, s.height, s.bitrate, s.duration #, s.codec_name
-                elif ModuleTools.INSTALLED_EXIFTOOL():
-                    try:
-                        result = json.loads(check_output(["exiftool", "-j", "-n", videoFile]))[0]
-                    except CalledProcessError:
-                        logger.warn("exiftool returned non-zero status for video %s", videoFile)
-                    except (IndexError, ValueError):
-                        logger.warn("Failed reading exiftool result for video %s", videoFile)
-                    else:
-                        try:
-                            return result["ImageWidth"], result["ImageHeight"], \
-                                    result["AvgBitrate"], result["Duration"]
-                        except KeyError:
-                            logger.warn("Failed reading video properties from exiftool JSON")
-		else:
-			logger.warn("None of [Python ffvideo library, exiftool] installed")
-
-	@staticmethod
-	def generatePreviewFromVideo(videoFile):
-		if ModuleTools.INSTALLED_FFVIDEO():
-			from ffvideo import VideoStream
-			fd, path = tempfile.mkstemp('.jpg')
-			stream = VideoStream(videoFile)
-			stream.get_frame_at_sec(0).image().save(path)
-			preview = ImageTools.generatePreviewFromImage(path)
-			os.remove(path)
-			return preview		
-		else:
-			logger.warn("Python ffvideo library not installed")
+    
+    @staticmethod
+    def getVideoProperties(videoFile):
+        if ModuleTools.INSTALLED_FFVIDEO():
+            from ffvideo import VideoStream
+            s = VideoStream(videoFile)
+            return s.width, s.height, s.bitrate, s.duration #, s.codec_name
+        elif ModuleTools.INSTALLED_EXIFTOOL():
+            try:
+                result = json.loads(check_output(["exiftool", "-j", "-n", videoFile]))[0]
+            except CalledProcessError:
+                logger.warn("exiftool returned non-zero status for video %s", videoFile)
+            except (IndexError, ValueError):
+                logger.warn("Failed reading exiftool result for video %s", videoFile)
+            else:
+                try:
+                    return result["ImageWidth"], result["ImageHeight"], \
+                            result["AvgBitrate"], result["Duration"]
+                except KeyError:
+                    logger.warn("Failed reading video properties from exiftool JSON")
+        else:
+            logger.warn("None of [Python ffvideo library, exiftool] installed")
+
+    @staticmethod
+    def generatePreviewFromVideo(videoFile):
+        if ModuleTools.INSTALLED_FFVIDEO():
+            from ffvideo import VideoStream
+            fd, path = tempfile.mkstemp('.jpg')
+            stream = VideoStream(videoFile)
+            stream.get_frame_at_sec(0).image().save(path)
+            preview = ImageTools.generatePreviewFromImage(path)
+            os.remove(path)
+            return preview      
+        else:
+            logger.warn("Python ffvideo library not installed")

yowsup/layers/axolotl/layer.py

@@ -298,7 +298,10 @@ def handlePreKeyWhisperMessage(self, node):
         sessionCipher = self.getSessionCipher(pkMessageProtocolEntity.getAuthor(False))
         plaintext = sessionCipher.decryptPkmsg(preKeyWhisperMessage)
         if enc.getVersion() == 2:
-            padding = ord(plaintext[-1]) & 0xFF
+            if isinstance(plaintext[-1], str):
+                padding = ord(plaintext[-1]) & 0xFF
+            else:
+                padding = plaintext[-1] & 0xFF
             self.parseAndHandleMessageProto(pkMessageProtocolEntity, plaintext[:-padding])
         else:
             self.handleConversationMessage(node, plaintext)
@@ -312,7 +315,10 @@ def handleWhisperMessage(self, node):
         plaintext = sessionCipher.decryptMsg(whisperMessage)
 
         if enc.getVersion() == 2:
-            padding = ord(plaintext[-1]) & 0xFF
+            if isinstance(plaintext[-1], str):
+                padding = ord(plaintext[-1]) & 0xFF
+            else:
+                padding = plaintext[-1] & 0xFF
             self.parseAndHandleMessageProto(encMessageProtocolEntity, plaintext[:-padding])
         else:
             self.handleConversationMessage(encMessageProtocolEntity.toProtocolTreeNode(), plaintext)
@@ -325,7 +331,10 @@ def handleSenderKeyMessage(self, node):
         groupCipher = GroupCipher(self.store, senderKeyName)
         try:
             plaintext = groupCipher.decrypt(enc.getData())
-            padding = ord(plaintext[-1]) & 0xFF
+            if isinstance(plaintext[-1], str):
+                padding = ord(plaintext[-1]) & 0xFF
+            else:
+                padding = plaintext[-1] & 0xFF
             self.parseAndHandleMessageProto(encMessageProtocolEntity, plaintext[:-padding])
         except NoSessionException as e:
             logger.error(e)
@@ -343,7 +352,7 @@ def parseAndHandleMessageProto(self, encMessageProtocolEntity, serializedData):
             #    f.write(serializedData)
             print(serializedData)
             print([s for s in serializedData])
-            print([ord(s) for s in serializedData])
+            #print([ord(s) for s in serializedData])
             raise
         if not m or not serializedData:
             raise ValueError("Empty message")