Replace most of always_iterable with version as found in more_itertools.

CHANGES.rst

@@ -1,3 +1,10 @@
+2.1
+===
+
+* Use ``more_itertools.more.always_iterable`` in place
+  of ``always_iterable`` except when a mapping is
+  included.
+
 2.0.1
 =====
 

jaraco/itertools.py

@@ -829,6 +829,7 @@ def reverse_lists(lists):
 
 	return list(map(list, map(reversed, lists)))
 
+
 def always_iterable(item):
 	"""
 	Given an object, always return an iterable. If the item is not
@@ -853,14 +854,12 @@ def always_iterable(item):
 	>>> always_iterable(dict(a=1))
 	({'a': 1},)
 	"""
-	if item is None:
-		item = ()
-	singleton = (
-		isinstance(item, six.string_types)
-		or isinstance(item, collections.Mapping)
-		or not hasattr(item, '__iter__')
+	return (
+		(item,)
+		if isinstance(item, collections.Mapping)
+		else more.always_iterable(item)
 	)
-	return (item,) if singleton else item
+
 
 def suppress_exceptions(callables, *exceptions):
 	"""

setup.py

@@ -34,7 +34,7 @@
 	python_requires='>=2.7',
 	install_requires=[
 		'six',
-		'more_itertools',
+		'more_itertools>=2.6',
 		'inflect',
 	],
 	extras_require={