Merge branch 'develop'

klen · Jul 6, 2015 · d27fa0b · d27fa0b
2 parents 058f14e + 8c67155
commit d27fa0b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,6 +1,6 @@
 [bumpversion]
 commit = True
-current_version = 5.1.3
+current_version = 5.1.4
 files = mixer/__init__.py
 tag = True
 tag_name = {new_version}

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,10 @@
+*.pyc
+*.txt
 /.env3
+/.stuff
+/.tox
 /build
 /todo.txt
 dist
 docs/_build
-*.txt
-/.stuff
+/*.egg-info
diff --git a/Makefile b/Makefile
@@ -55,7 +55,7 @@ register:
 
 .PHONY: upload
 # target: upload - Upload module on PyPi
-upload: clean docs
+upload: clean
 	@pip install twine wheel
 	@python setup.py sdist bdist_wheel
 	@twine upload dist/*

diff --git a/mixer/__init__.py b/mixer/__init__.py
@@ -14,7 +14,7 @@
 # Module information
 # ==================
 
-__version__ = "5.1.3"
+__version__ = "5.1.4"
 __project__ = "mixer"
 __author__ = "horneds <horneds@gmail.com>"
 __license__ = "BSD"
diff --git a/mixer/main.py b/mixer/main.py
@@ -483,7 +483,7 @@ def __init__(self, fake=True, factory=None, loglevel=LOGLEVEL,
         self.params = params
         self.faker = faker
         self.__init_params__(fake=fake, loglevel=loglevel, silence=silence, locale=locale)
-        self.__factory = factory
+        self.__factory = factory or self.type_mixer_cls.factory
 
     def __getattr__(self, name):
         if name in ['f', 'g', 'fake', 'random', 'mix', 'select']: