Merge remote-tracking branch 'remotes/upstream/master' into python-2-deprecation

Conengmo · Conengmo · commit 055180fcf53b · 2018-11-07T08:39:27.000+01:00
diff --git a/tests/test_features.py b/tests/test_features.py
@@ -10,8 +10,9 @@
 
 import os
 
+from six import text_type
+
 from branca.element import Element
-from branca.six import text_type
 
 from folium import Map, Popup
 import folium
