Merge branch 'develop'

.bumpversion.cfg

@@ -1,6 +1,6 @@
 [bumpversion]
 commit = True
-current_version = 6.0.0
+current_version = 6.0.1
 files = mixer/__init__.py
 tag = True
 tag_name = {new_version}

mixer/__init__.py

@@ -14,7 +14,7 @@
 # Module information
 # ==================
 
-__version__ = "6.0.0"
+__version__ = "6.0.1"
 __project__ = "mixer"
 __author__ = "horneds <horneds@gmail.com>"
 __license__ = "BSD"

mixer/factory.py

@@ -2,6 +2,7 @@
 
 import datetime
 import decimal
+import inspect
 
 from . import _compat as _, mix_types as t
 from ._faker import faker
@@ -141,9 +142,10 @@ def cls_to_simple(cls, fcls):
         if fcls in cls.generators:
             return fcls
 
-        for stype in cls.types:
-            if issubclass(fcls, stype):
-                return cls.types[stype]
+        if inspect.isclass(fcls):
+            for stype in cls.types:
+                if issubclass(fcls, stype):
+                    return cls.types[stype]
 
         return None