pymcnp/inp: updated __init__.py imports

Author: BitterB0NG0

src/pymcnp/_text.py

@@ -141,14 +141,16 @@ def ATTRS_COMMENT(element, t):
 # ELEMENT #
 def INIT(element):
     return f"""
-from .option_ import {CAMEL(element.name)}Option_\n
-{'\n'.join(f'from .{CAMEL(option.name)} import {CAMEL(option.name)}' for option in element.options)}
+from .option_ import {CAMEL(element.name)}Option_
+{''.join(f"from . import {SNAKE(option.name)}\n" if option.options else "" for option in element.options)[:-1]}
+{''.join(f'from .{CAMEL(option.name)} import {CAMEL(option.name)}\n' for option in element.options)[:-1]}
 
 __all__ = [
     "{CAMEL(element.name)}Option_",
-    {',\n\t'.join(f'"{CAMEL(option.name)}"' for option in element.options)}
+    {''.join(f'\t"{SNAKE(option.name)}",\n' if option.options else "" for option in element.options).strip()}
+    {''.join(f'\t"{CAMEL(option.name)}",\n' for option in element.options).strip()}
 ]
-"""[:-1]
+"""[1:-1]
 
 
 def OPTION(element, depth):

src/pymcnp/inp/data/__init__.py

@@ -1,5 +1,25 @@
 from .option_ import DataOption_
-
+from . import dawwg
+from . import embed
+from . import embee
+from . import m
+from . import act
+from . import fmult
+from . import tropt
+from . import bfld
+from . import sdef
+from . import ssw
+from . import ssr
+from . import kopts
+from . import pert
+from . import kpert
+from . import ksen
+from . import fmesh
+from . import var
+from . import mesh
+from . import stop
+from . import ptrac
+from . import rand
 from .Vol import Vol
 from .Area import Area
 from .Tr import Tr
@@ -121,6 +141,27 @@
 
 __all__ = [
     'DataOption_',
+    'dawwg',
+    'embed',
+    'embee',
+    'm',
+    'act',
+    'fmult',
+    'tropt',
+    'bfld',
+    'sdef',
+    'ssw',
+    'ssr',
+    'kopts',
+    'pert',
+    'kpert',
+    'ksen',
+    'fmesh',
+    'var',
+    'mesh',
+    'stop',
+    'ptrac',
+    'rand',
     'Vol',
     'Area',
     'Tr',

src/pymcnp/inp/data/bfld/__init__.py

@@ -8,4 +8,13 @@
 from .Ffedges import Ffedges
 from .Refpnt import Refpnt
 
-__all__ = ['BfldOption_', 'Field', 'Vec', 'Maxdeflc', 'Maxstep', 'Axs', 'Ffedges', 'Refpnt']
+__all__ = [
+    'BfldOption_',
+    'Field',
+    'Vec',
+    'Maxdeflc',
+    'Maxstep',
+    'Axs',
+    'Ffedges',
+    'Refpnt',
+]

src/pymcnp/inp/data/dawwg/__init__.py

@@ -1,7 +1,13 @@
 from .option_ import DawwgOption_
-
+from . import block
 from .Points import Points
 from .Xsec import Xsec
 from .Block import Block
 
-__all__ = ['DawwgOption_', 'Points', 'Xsec', 'Block']
+__all__ = [
+    'DawwgOption_',
+    'block',
+    'Points',
+    'Xsec',
+    'Block',
+]

src/pymcnp/inp/data/embee/__init__.py

@@ -9,4 +9,14 @@
 from .Mat import Mat
 from .Mtype import Mtype
 
-__all__ = ['EmbeeOption_', 'Embed', 'Energy', 'Time', 'Atom', 'Factor', 'List', 'Mat', 'Mtype']
+__all__ = [
+    'EmbeeOption_',
+    'Embed',
+    'Energy',
+    'Time',
+    'Atom',
+    'Factor',
+    'List',
+    'Mat',
+    'Mtype',
+]

src/pymcnp/inp/data/fmult/__init__.py

@@ -7,4 +7,12 @@
 from .Data import Data
 from .Shift import Shift
 
-__all__ = ['FmultOption_', 'Width', 'Sfyield', 'Watt', 'Method', 'Data', 'Shift']
+__all__ = [
+    'FmultOption_',
+    'Width',
+    'Sfyield',
+    'Watt',
+    'Method',
+    'Data',
+    'Shift',
+]

src/pymcnp/inp/data/kpert/__init__.py

@@ -8,4 +8,13 @@
 from .Erg import Erg
 from .Linear import Linear
 
-__all__ = ['KpertOption_', 'Cell', 'Mat', 'Rho', 'Iso', 'Rxn', 'Erg', 'Linear']
+__all__ = [
+    'KpertOption_',
+    'Cell',
+    'Mat',
+    'Rho',
+    'Iso',
+    'Rxn',
+    'Erg',
+    'Linear',
+]

src/pymcnp/inp/data/ksen/__init__.py

@@ -9,4 +9,14 @@
 from .Cos import Cos
 from .Constrain import Constrain
 
-__all__ = ['KsenOption_', 'Iso', 'Rxn', 'Mt', 'Erg', 'Ein', 'Legendre', 'Cos', 'Constrain']
+__all__ = [
+    'KsenOption_',
+    'Iso',
+    'Rxn',
+    'Mt',
+    'Erg',
+    'Ein',
+    'Legendre',
+    'Cos',
+    'Constrain',
+]

src/pymcnp/inp/data/pert/__init__.py

@@ -7,4 +7,12 @@
 from .Erg import Erg
 from .Rxn import Rxn
 
-__all__ = ['PertOption_', 'Cell', 'Mat', 'Rho', 'Method', 'Erg', 'Rxn']
+__all__ = [
+    'PertOption_',
+    'Cell',
+    'Mat',
+    'Rho',
+    'Method',
+    'Erg',
+    'Rxn',
+]

src/pymcnp/inp/data/rand/__init__.py

@@ -5,4 +5,10 @@
 from .Stride import Stride
 from .Hist import Hist
 
-__all__ = ['RandOption_', 'Gen', 'Seed', 'Stride', 'Hist']
+__all__ = [
+    'RandOption_',
+    'Gen',
+    'Seed',
+    'Stride',
+    'Hist',
+]