fix pylint error for python-requests

Change-Id: I1635b1d72154044a259a706d084f5a4442d41267
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/debian/control b/debian/control
index f6fb1de..82252d4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Depends:  ${python:Depends},
  python,
  cpio,
  bzip2,
- gzip
+ gzip,
+ python-pytest
 Description: image creator for Linux distributions
   The tool createrep is used to ppfarm test
 

diff --git a/packaging/python-requests.spec b/packaging/python-requests.spec
index 98d56a1..382b3ad 100644 (file)
--- a/packaging/python-requests.spec
+++ b/packaging/python-requests.spec
@@ -34,6 +34,7 @@ BuildRequires:  python
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:       python
+Requires:       python-pytest
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %else

diff --git a/requests/compat.py b/requests/compat.py
index 0d61a57..ac4ada9 100644 (file)
--- a/requests/compat.py
+++ b/requests/compat.py
@@ -100,13 +100,13 @@ if is_py2:
 
 
 elif is_py3:
-    from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag
-    from urllib.request import parse_http_list, getproxies, proxy_bypass
-    from http import cookiejar as cookielib
-    from http.cookies import Morsel
+    from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag  # pylint: disable=E0401,E0611
+    from urllib.request import parse_http_list, getproxies, proxy_bypass # pylint: disable=E0401,E0611
+    from http import cookiejar as cookielib # pylint: disable=E0401
+    from http.cookies import Morsel # pylint: disable=E0401
     from io import StringIO
     from collections import OrderedDict
-    from http.client import IncompleteRead
+    from http.client import IncompleteRead  # pylint: disable=E0401
 
     builtin_str = str
     str = str

diff --git a/requests/packages/charade/__init__.py b/requests/packages/charade/__init__.py
index 26362e9..e432260 100644 (file)
--- a/requests/packages/charade/__init__.py
+++ b/requests/packages/charade/__init__.py
@@ -33,8 +33,7 @@ def detect(aBuf):
 \r
 def _description_of(path):\r
     """Return a string describing the probable encoding of a file."""\r
-    from charade.universaldetector import UniversalDetector\r
-\r
+    from requests.packages.charade.universaldetector import UniversalDetector\r
     u = UniversalDetector()\r
     for line in open(path, 'rb'):\r
         u.feed(line)\r
@@ -63,4 +62,4 @@ def charade_cli():
     from sys import argv\r
     for path in argv[1:]:\r
         print(_description_of(path))\r
-        
\ No newline at end of file
+\r

diff --git a/requests/packages/charade/__main__.py b/requests/packages/charade/__main__.py
index c0d587f..18c82b7 100644 (file)
--- a/requests/packages/charade/__main__.py
+++ b/requests/packages/charade/__main__.py
@@ -2,6 +2,6 @@
 support ';python -m charade <file1> [file2] ...' package execution syntax (2.7+)\r
 '''\r
 \r
-from charade import charade_cli\r
+from requests.packages.charade import charade_cli\r
 \r
 charade_cli()\r

diff --git a/requests/packages/charade/chardistribution.py b/requests/packages/charade/chardistribution.py
index dfd3355..d0988cc 100644 (file)
--- a/requests/packages/charade/chardistribution.py
+++ b/requests/packages/charade/chardistribution.py
@@ -76,7 +76,7 @@ class CharDistributionAnalysis:
             self._mTotalChars += 1\r
             # order is valid\r
             if order < self._mTableSize:\r
-                if 512 > self._mCharToFreqOrder[order]:\r
+                if 512 > self._mCharToFreqOrder[order]:  #pylint: disable=unsubscriptable-object\r
                     self._mFreqChars += 1\r
 \r
     def get_confidence(self):\r

diff --git a/requests/packages/charade/langcyrillicmodel.py b/requests/packages/charade/langcyrillicmodel.py
index 15e338f..168b5ad 100644 (file)
--- a/requests/packages/charade/langcyrillicmodel.py
+++ b/requests/packages/charade/langcyrillicmodel.py
@@ -308,7 +308,7 @@ MacCyrillicModel = {
   'mTypicalPositiveRatio': 0.976601,\r
   'keepEnglishLetter': False,\r
   'charsetName': "MacCyrillic"\r
-};\r
+}\r
 \r
 Ibm866Model = {\r
   'charToOrderMap': IBM866_CharToOrderMap,\r

diff --git a/requests/packages/urllib3/contrib/ntlmpool.py b/requests/packages/urllib3/contrib/ntlmpool.py
index b8cd933..9a9f512 100644 (file)
--- a/requests/packages/urllib3/contrib/ntlmpool.py
+++ b/requests/packages/urllib3/contrib/ntlmpool.py
@@ -15,7 +15,8 @@ try:
 except ImportError:
     from httplib import HTTPSConnection
 from logging import getLogger
-from ntlm import ntlm
+
+from ntlmpool import ntlm
 
 from urllib3 import HTTPSConnectionPool
 

diff --git a/requests/packages/urllib3/packages/ordered_dict.py b/requests/packages/urllib3/packages/ordered_dict.py
index 7f8ee15..9b3b1b5 100644 (file)
--- a/requests/packages/urllib3/packages/ordered_dict.py
+++ b/requests/packages/urllib3/packages/ordered_dict.py
@@ -140,7 +140,7 @@ class OrderedDict(dict):
         for k in self:
             yield (k, self[k])
 
-    def update(*args, **kwds):
+    def update(self,*args, **kwds):
         '''od.update(E, **F) -> None.  Update od from dict/iterable E and F.
 
         If E is a dict instance, does:           for k in E: od[k] = E[k]

diff --git a/requests/packages/urllib3/packages/six.py b/requests/packages/urllib3/packages/six.py
index 27d8011..ca2a76f 100644 (file)
--- a/requests/packages/urllib3/packages/six.py
+++ b/requests/packages/urllib3/packages/six.py
@@ -300,7 +300,7 @@ _add_doc(u, """Text literal""")
 
 
 if PY3:
-    import builtins
+    import builtins #pylint: disable=import-error
     exec_ = getattr(builtins, "exec")
 
 

diff --git a/requests/packages/urllib3/request.py b/requests/packages/urllib3/request.py
index 66a9a0e..ab1dee9 100644 (file)
--- a/requests/packages/urllib3/request.py
+++ b/requests/packages/urllib3/request.py
@@ -53,7 +53,7 @@ class RequestMethods(object):
     def urlopen(self, method, url, body=None, headers=None,
                 encode_multipart=True, multipart_boundary=None,
                 **kw): # Abstract
-        raise NotImplemented("Classes extending RequestMethods must implement "
+        raise NotImplementedError("Classes extending RequestMethods must implement "
                              "their own ``urlopen`` method.")
 
     def request(self, method, url, fields=None, headers=None, **urlopen_kw):