Merge branch 'master' of triton.inf-cv.uni-jena.de:ComputerVisionJena/cvargparse

cvargparse/__init__.py

@@ -1,6 +1,6 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"
 
 from .argument import Argument, FileArgument
-from .factory import ArgFactory
+from .factory import ArgFactory, BaseFactory
 from .parser import BaseParser, GPUParser
 Arg = Argument

cvargparse/parser.py

@@ -1,14 +1,14 @@
 import argparse, logging
 
 from cvargparse.argument import Argument as Arg
-from cvargparse.factory import ArgFactory
+from cvargparse.factory import BaseFactory
 
 class BaseParser(argparse.ArgumentParser):
 	def __init__(self, arglist=[], nologging=False, sysargs=None, *args, **kw):
 		super(BaseParser, self).__init__(*args, **kw)
 		self.__nologging = nologging
 		self.__sysargs = sysargs
-		if isinstance(arglist, ArgFactory):
+		if isinstance(arglist, BaseFactory):
 			arglist = arglist.get()
 
 		for arg in arglist: