2to3: Migrate to python3

Author: mmatczuk

ncdu_s3/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from .ncdu_data_writer import NcduDataWriter
 from .directory_walker import DirectoryWalker
 from .s3_directory_generator import S3DirectoryGenerator

ncdu_s3/directory_walker.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import itertools
 
 
@@ -20,7 +18,7 @@ def process_item(self, path, size):
             conflict = False
             add_dirs = []
 
-            for p1, p2 in itertools.izip_longest(self.current_path, path):
+            for p1, p2 in itertools.zip_longest(self.current_path, path):
                 if p1 != p2:
                     # first conflict starts another logic in our code
                     conflict = True

ncdu_s3/main.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import click
 from ncdu_s3 import NcduDataWriter, DirectoryWalker, S3DirectoryGenerator
 
@@ -12,7 +11,7 @@ def main(ctx, s3_url, output):
 
     try:
         s3_directory_generator = S3DirectoryGenerator(s3_url)
-    except SyntaxError, e:
+    except SyntaxError as e:
         ctx.fail(e.message)
         return
 

ncdu_s3/ncdu_data_writer.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import time
 import ujson as json
 
@@ -62,7 +60,7 @@ def file_entry(self, name, size):
         json.dump({'name': name, 'dsize': size}, self.output)
 
     def close(self):
-        for i in xrange(self.depth):
+        for i in range(self.depth):
             self.dir_leave()
 
         # close the format JSON document we opened in our constructor

ncdu_s3/s3_directory_generator.py

@@ -1,11 +1,9 @@
-from __future__ import absolute_import
-
-import urlparse
+import urllib.parse
 import boto3
 
 class S3DirectoryGenerator(object):
     def __init__(self, s3_url):
-        parsed_s3_url = urlparse.urlparse(s3_url)
+        parsed_s3_url = urllib.parse.urlparse(s3_url)
         if parsed_s3_url.scheme != 's3':
             raise SyntaxError('Invalid S3 scheme')