Merge branch 'master' of https://github.com/plusvic/yara

VirusTotal · Feb 10, 2015 · ec05041 · ec05041
2 parents 7fa2c1f + 6468404
commit ec05041
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/yara-python/tests.py b/yara-python/tests.py
@@ -371,7 +371,7 @@ def testBitwiseOperators(self):
             'rule test { condition: 1 << 3 == 8 }',
             'rule test { condition: 1 | 3 ^ 3 == 1 | (3 ^ 3) }'
             ])
-            
+
         self.assertFalseRules([
             'rule test { condition: ~0xAA ^ 0x5A & 0xFF == 0x0F }',
             'rule test { condition: 1 | 3 ^ 3 == (1 | 3) ^ 3}'
@@ -827,7 +827,7 @@ def testIntegerFunctions(self):
             'rule test { condition: uint8be(0) == 0xAA}',
             'rule test { condition: uint16be(0) == 0xAABB}',
             'rule test { condition: uint32be(0) == 0xAABBCCDD}',
-          ], '\xAA\xBB\xCC\xDD')
+          ], b'\xAA\xBB\xCC\xDD')
 
 
 if __name__ == "__main__":