Merge "py3: replace itertools.imap with six.moves.map"

fuelclient/cli/actions/base.py

@@ -14,7 +14,6 @@
 
 from functools import partial
 from functools import wraps
-from itertools import imap
 import os
 
 import six
@@ -75,7 +74,7 @@ class Action(object):
         )
         return "Examples:\n\n" + \
                "\n".join(
-                   imap(
+                   six.moves.map(
                        lambda method: (
                            "\t" + method.__doc__.replace("\n    ", "\n")
                        ),

fuelclient/cli/serializers.py

@@ -13,8 +13,6 @@
 #    under the License.
 from __future__ import print_function
 
-from itertools import ifilter
-from itertools import imap
 import json
 import os
 
@@ -132,9 +130,9 @@ class FileFormatBasedSerializer(Serializer):
 
 
 def listdir_without_extensions(dir_path):
-    return ifilter(
+    return six.moves.filter(
         lambda f: f != "",
-        imap(
+        six.moves.map(
             lambda f: f.split(".")[0],
             os.listdir(dir_path)
         )