fixes for python2

diff --git a/requests/packages/chardet/codingstatemachine.py b/requests/packages/chardet/codingstatemachine.py
index 66d766fa70d3fa6b002ed5117ff93146706ec7e4..0ba98b7f129e2632b2c62e3f9f0062aad6815e1b 100644 (file)
--- a/requests/packages/chardet/codingstatemachine.py
+++ b/requests/packages/chardet/codingstatemachine.py
@@ -13,12 +13,12 @@
 # modify it under the terms of the GNU Lesser General Public\r
 # License as published by the Free Software Foundation; either\r
 # version 2.1 of the License, or (at your option) any later version.\r
-# \r
+#\r
 # This library is distributed in the hope that it will be useful,\r
 # but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
 # Lesser General Public License for more details.\r
-# \r
+#\r
 # You should have received a copy of the GNU Lesser General Public\r
 # License along with this library; if not, write to the Free Software\r
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\r
@@ -41,6 +41,9 @@ class CodingStateMachine:
         # for each byte we get its class\r
         # if it is first byte, we also get byte length\r
         # PY3K: aBuf is a byte stream, so c is an int, not a byte\r
+        if hasattr(c, 'encode'):\r
+            c = int(c.encode('hex'), 16)\r
+\r
         byteCls = self._mModel['classTable'][c]\r
         if self._mCurrentState == eStart:\r
             self._mCurrentBytePos = 0\r

diff --git a/requests/packages/chardet/latin1prober.py b/requests/packages/chardet/latin1prober.py
index 6ecc02231cd8991cb45f51bd0d28dabd9f583a4d..ac38f89e015e7cbabaf56fa8aed29d3575df0bfa 100644 (file)
--- a/requests/packages/chardet/latin1prober.py
+++ b/requests/packages/chardet/latin1prober.py
@@ -14,12 +14,12 @@
 # modify it under the terms of the GNU Lesser General Public\r
 # License as published by the Free Software Foundation; either\r
 # version 2.1 of the License, or (at your option) any later version.\r
-# \r
+#\r
 # This library is distributed in the hope that it will be useful,\r
 # but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
 # Lesser General Public License for more details.\r
-# \r
+#\r
 # You should have received a copy of the GNU Lesser General Public\r
 # License along with this library; if not, write to the Free Software\r
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\r
@@ -76,9 +76,9 @@ Latin1_CharToClass = ( \
   ASV, ASV, ASV, ASV, ASV, ASO, ASO, ASO,   # F8 - FF\r
 )\r
 \r
-# 0 : illegal \r
-# 1 : very unlikely \r
-# 2 : normal \r
+# 0 : illegal\r
+# 1 : very unlikely\r
+# 2 : normal\r
 # 3 : very likely\r
 Latin1ClassModel = ( \\r
 # UDF OTH ASC ASS ACV ACO ASV ASO\r
@@ -108,6 +108,8 @@ class Latin1Prober(CharSetProber):
     def feed(self, aBuf):\r
         aBuf = self.filter_with_english_letters(aBuf)\r
         for c in aBuf:\r
+            if hasattr(c, 'encode'):\r
+                c = int(c.encode('hex'), 16)\r
             charClass = Latin1_CharToClass[c]\r
             freq = Latin1ClassModel[(self._mLastCharClass * CLASS_NUM) + charClass]\r
             if freq == 0:\r
@@ -121,7 +123,7 @@ class Latin1Prober(CharSetProber):
     def get_confidence(self):\r
         if self.get_state() == constants.eNotMe:\r
             return 0.01\r
-  \r
+\r
         total = sum(self._mFreqCounter)\r
         if total < 0.01:\r
             confidence = 0.0\r
@@ -129,7 +131,7 @@ class Latin1Prober(CharSetProber):
             confidence = (self._mFreqCounter[3] / total) - (self._mFreqCounter[1] * 20.0 / total)\r
         if confidence < 0.0:\r
             confidence = 0.0\r
-        # lower the confidence of latin1 so that other more accurate detector \r
+        # lower the confidence of latin1 so that other more accurate detector\r
         # can take priority.\r
         confidence = confidence * 0.5\r
         return confidence\r

diff --git a/requests/packages/chardet/sbcharsetprober.py b/requests/packages/chardet/sbcharsetprober.py
index 186609054f744131dba3bfe07977653684076a14..8350d4ce7f65cd393c900707b0dd83eddda4b519 100644 (file)
--- a/requests/packages/chardet/sbcharsetprober.py
+++ b/requests/packages/chardet/sbcharsetprober.py
@@ -14,12 +14,12 @@
 # modify it under the terms of the GNU Lesser General Public\r
 # License as published by the Free Software Foundation; either\r
 # version 2.1 of the License, or (at your option) any later version.\r
-# \r
+#\r
 # This library is distributed in the hope that it will be useful,\r
 # but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
 # Lesser General Public License for more details.\r
-# \r
+#\r
 # You should have received a copy of the GNU Lesser General Public\r
 # License along with this library; if not, write to the Free Software\r
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\r
@@ -38,7 +38,7 @@ SYMBOL_CAT_ORDER = 250
 NUMBER_OF_SEQ_CAT = 4\r
 POSITIVE_CAT = NUMBER_OF_SEQ_CAT - 1\r
 #NEGATIVE_CAT = 0\r
- \r
+\r
 class SingleByteCharSetProber(CharSetProber):\r
     def __init__(self, model, reversed=False, nameProber=None):\r
         CharSetProber.__init__(self)\r
@@ -68,6 +68,8 @@ class SingleByteCharSetProber(CharSetProber):
         if not aLen:\r
             return self.get_state()\r
         for c in aBuf:\r
+            if hasattr(c, 'encode'):\r
+                c = int(c.encode('hex'), 16)\r
             order = self._mModel['charToOrderMap'][c]\r
             if order < SYMBOL_CAT_ORDER:\r
                 self._mTotalChar += 1\r