From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Thu, 23 Jun 2016 12:33:40 +0000 (+0200)
Subject: appease pylint
X-Git-Tag: v2.2~17
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=f0287fb75f401e21a803d461a44ba201933c1166;p=python-delta-tar

appease pylint
---

diff --git a/deltatar/aescrypto.py b/deltatar/aescrypto.py
index 2dce10c..18bdb73 100644
--- a/deltatar/aescrypto.py
+++ b/deltatar/aescrypto.py
@@ -222,7 +222,7 @@ def decrypt(in_file, out_file, password):
 
 
 if __name__ == '__main__':
-    from StringIO import StringIO
+    from io import StringIO
     infile = StringIO('clear text')
     cipher = StringIO()
     out = StringIO()
diff --git a/deltatar/deltatar.py b/deltatar/deltatar.py
index aa59cd6..8f72897 100644
--- a/deltatar/deltatar.py
+++ b/deltatar/deltatar.py
@@ -225,7 +225,7 @@ class DeltaTar(object):
         if volume_name_func is not None:
             self.volume_name_func = volume_name_func
 
-    def index_name_func(self, is_full):
+    def index_name_func(self, is_full):         # pylint: disable=method-hidden
         '''
         function that sets a custom name for the index file. This function
         receives the backup_path and if it's a full backup as arguments and must
@@ -244,7 +244,9 @@ class DeltaTar(object):
         '''
         return self.__index_extensions_dict[self.index_mode]
 
-    def volume_name_func(self, backup_path, is_full, volume_number, guess_name=False):
+    def volume_name_func(self, backup_path,     # pylint: disable=method-hidden
+                         is_full, volume_number,
+                         guess_name=False):
         '''
         function that defines the name of tar volumes. It receives the
         backup_path, if it's a full backup and the volume number, and must return
diff --git a/deltatar/tarfile.py b/deltatar/tarfile.py
index 8ff3d9d..4cf0e69 100644
--- a/deltatar/tarfile.py
+++ b/deltatar/tarfile.py
@@ -324,7 +324,7 @@ class _LowLevelFile:
             "w": os.O_WRONLY | os.O_CREAT | os.O_TRUNC,
         }[mode]
         if hasattr(os, "O_BINARY"):
-            _mode |= os.O_BINARY
+            _mode |= os.O_BINARY                    # pylint: disable=no-member
         self.fd = os.open(name, _mode, 0o666)
         self.offset = 0
 
@@ -873,7 +873,7 @@ class _StreamProxy(object):
         self.fileobj = fileobj
         self.buf = self.fileobj.read(BLOCKSIZE)
 
-    def read(self, size):
+    def read(self, size):                       # pylint: disable=method-hidden
         self.read = self.fileobj.read
         return self.buf
 
@@ -1656,7 +1656,7 @@ class TarInfo(object):
                     except ValueError:
                         value = 0
                 if keyword == "path":
-                    value = value.rstrip("/")
+                    value = value.rstrip("/")       # pylint: disable=no-member
                 setattr(self, keyword, value)
 
         self.pax_headers = pax_headers.copy()
diff --git a/testing/create_pseudo_random_files.py b/testing/create_pseudo_random_files.py
index 75e1af8..d5a12cb 100755
--- a/testing/create_pseudo_random_files.py
+++ b/testing/create_pseudo_random_files.py
@@ -150,42 +150,42 @@ def main(args = None):
     parser.add_argument('--path', action='store', help='Path to generate. ')
 
     if not args:
-        parser = parser.parse_args()
+        parsed_args = parser.parse_args()
     else:
-        parser = parser.parse_args(args)
+        parsed_args = parser.parse_args(args)
 
-    if parser.seed is not None:
-        seed = parser.seed
+    if parsed_args.seed is not None:
+        seed = parsed_args.seed
     else:
         seed = random.randint(0, 1000000000)
     random.seed(seed)
-    if parser.ndir is not None:
-        ndir = parser.ndir
+    if parsed_args.ndir is not None:
+        ndir = parsed_args.ndir
     else:
         ndir = random.randint(0, 50000)
-    if parser.deep is not None:
-        deep = parser.deep
+    if parsed_args.deep is not None:
+        deep = parsed_args.deep
     else:
         deep = random.randint(0, 100)
-    if parser.nfile:
-        nfile = parser.nfile
+    if parsed_args.nfile:
+        nfile = parsed_args.nfile
     else:
         nfile = random.randint(1, 500000)
-    if parser.size:
-        size = parser.size * 1024 * 1024 # MB to byte
+    if parsed_args.size:
+        size = parsed_args.size * 1024 * 1024 # MB to byte
     else:
         size = random.randint(1, 5000)
         size = size * 1024 * 1024 # MB to byte
-    if parser.distribute_files is not None:
-        distribute_files = parser.distribute_files
+    if parsed_args.distribute_files is not None:
+        distribute_files = parsed_args.distribute_files
     else:
         distribute_files = random.randint(0, 100)
-    if parser.distribute_size is not None:
-        distribute_size = parser.distribute_size
+    if parsed_args.distribute_size is not None:
+        distribute_size = parsed_args.distribute_size
     else:
         distribute_size = random.randint(0, 100)
-    if parser.path:
-        path = os.path.abspath(parser.path)
+    if parsed_args.path:
+        path = os.path.abspath(parsed_args.path)
         if not os.path.exists(path):
             os.makedirs(path)
     else:
diff --git a/testing/test_deltatar.py b/testing/test_deltatar.py
index 006ba7c..8c8f67b 100644
--- a/testing/test_deltatar.py
+++ b/testing/test_deltatar.py
@@ -407,7 +407,7 @@ class DeltaTarTest(BaseTest):
         def new_volume_handler(mode, tarobj, base_name, volume_number):
             tarobj.open_volume(datetime.now().strftime(
                 "backup_dir/bfull-%Y-%m-%d-%H%M-002.tar") +\
-                DeltaTar._DeltaTar__file_extensions_dict[mode])
+                DeltaTar._DeltaTar__file_extensions_dict[mode])  # pylint: disable=no-member
         new_volume_handler = partial(new_volume_handler, self.MODE)
 
         tarobj = TarFile.open(mode="r" + self.MODE, fileobj=fo,