Browse Source

refactored some import stuff. new version

Dimitri Korsch 5 years ago
parent
commit
ce213a6c06

+ 18 - 4
cvargparse/__init__.py

@@ -1,6 +1,20 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"
 
-from .argument import Argument, FileArgument
-from .factory import ArgFactory, BaseFactory
-from .parser import BaseParser, GPUParser
+from cvargparse.argument import Argument
+from cvargparse.argument import FileArgument
 Arg = Argument
+
+from cvargparse.factory import ArgFactory
+from cvargparse.factory import BaseFactory
+from cvargparse.parser import BaseParser
+from cvargparse.parser import GPUParser
+
+__all__ = [
+	"Arg",
+	"Argument",
+	"FileArgument",
+	"ArgFactory",
+	"BaseFactory",
+	"BaseParser",
+	"GPUParser",
+]

+ 2 - 1
cvargparse/factory.py

@@ -1,7 +1,8 @@
+from abc import ABC
+
 from cvargparse.utils import factory
 from cvargparse.argument import Argument as Arg
 
-from abc import ABC
 
 class BaseFactory(ABC):
 	'''

+ 2 - 1
cvargparse/parser.py

@@ -1,4 +1,5 @@
-import argparse, logging
+import argparse
+import logging
 
 from cvargparse.argument import Argument as Arg
 from cvargparse.factory import BaseFactory

+ 7 - 2
cvargparse/utils/__init__.py

@@ -1,2 +1,7 @@
-from .decorators import *
-from .enumerations import *
+from cvargparse.utils.decorators import factory
+from cvargparse.utils.enumerations import BaseChoiceType
+
+__all__ = [
+	"factory",
+	"BaseChoiceType",
+]

+ 4 - 3
cvargparse/utils/enumerations.py

@@ -1,6 +1,7 @@
-from enum import Enum, EnumMeta
+from enum import Enum
+from enum import EnumMeta
 
-import cvargparse
+from cvargparse import Arg
 
 class MetaBaseType(EnumMeta):
 	"""
@@ -56,7 +57,7 @@ class BaseChoiceType(Enum, metaclass=MetaBaseType):
 
 		help_text += " (default: {})".format(default)
 
-		return cvargparse.Arg(*args,
+		return Arg(*args,
 			type=str, default=default,
 			choices=cls.as_choices(),
 			help=help_text,