pywargame 0.4.1__tar.gz → 0.4.3__tar.gz

{pywargame-0.4.1 → pywargame-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pywargame
-Version: 0.4.1
+Version: 0.4.3
 Summary: Python library to manipulate wargame modules
 Home-page: https://wargames_tex.gitlab.io/pywargame/
 Author: Christian Holm Christensen
@@ -32,7 +32,7 @@ Aided Wargaming (CAW).
 
 - [`pywargame`](pywargame) Top of package 
   - [`common`](pywargame/common) Common utilities used by other code.
-  - [`vassal`](pywargame/vassal) Read or write
+  - [`vassal`](pywargame/vassal) Read or write 
     [VASSAL](https://vassalengine.org)
     ([GitHub](https://github.com/vassalengine/vassal)) modules,
     including
@@ -42,7 +42,7 @@ Aided Wargaming (CAW).
   - [`cyberboard`](pywargame/cyberboard) Read
     [CyberBoard](http://cyberboard.norsesoft.com/)
     ([GitHub](https://github.com/CyberBoardPBEM/cbwindows)) GameBox
-    files.
+    and scenario files.
   - [`zuntzu`](pywargame/zuntzu) Convert [ZunTzu](https://zuntzu.com)
     ([GitHub](https://github.com/ZunTzu-Software/ZunTzu)) GameBox to
     VASSAL module.
@@ -53,9 +53,15 @@ Aided Wargaming (CAW).
 
 ## Changes 
 
-The code isn't versioned yet, and therefore the changes are given by
-date. 
-
+- 0.4.3 
+  - Update for CI/CD
+- 0.4.2 
+  - Some fixes for imports 
+  - Scripts done as entry points in `pip` install 
+- 0.4.1 
+  - Some fixes to `pip` releases 
+- 0.4.0
+  - First release via `pip` 
 - 2nd of February, 2024
   - Fix problem with background of maps exported from CyberBoard
     gamebox.  Thanks to @zovs66 for pointing this out. 
@@ -64,47 +70,56 @@ date.
     
 ## Scripts 
 
-- [`vslmerge.py`](vassal/merge.py) merges VASSAL modules and
+- [`vslmerge.py`](pywargame/vassal/merge.py) merges VASSAL modules and
   extensions together into one module.  This is work in progress.
-  Please report any problems you see. 
+  Please report any problems you see.
   
-- [`vmodpatch.py`](vassal/patch.py) patches a VASSAL modules by
-  running a Python script on it.  The input module file is
-  overwritten. 
+- [`vmodpatch.py`](pywargame/vassal/patch.py) patches a VASSAL modules
+  by running a Python script on it.  The input module file is
+  overwritten.
   
-- [`vsavdump.py`](vassal/dumpsave.py) dumps the content of a VASSAL
-  save or log file to standard output. 
+- [`vsavdump.py`](pywargame/vassal/dumpsave.py) dumps the content of a
+  VASSAL save or log file to standard output.
   
-- [`gbxextract.py`](cyberboard/gbxext.py) reads in a CyberBoard
-  GameBox file (`.gbx`) and writes out a ZIP file with images and a
-  JSON file with information about the GameBox and the images. 
+- [`gbxextract.py`](pywargame/cyberboard/gbxext.py) reads in a
+  CyberBoard GameBox file (`.gbx`) and writes out a ZIP file with
+  images and a JSON file with information about the GameBox and the
+  images.
   
   Pieces (units and markers) are saved as PNGs, while the boards are
   saves as SVGs. 
   
-- [`gsnextract.py`](cyberboard/gsnext.py) reads in a CyberBoard
-  Scenario file (`.gsn`) and writes out a ZIP file with images and a
-  JSON file with information about the Scenario, GameBox, and the
-  images.
+- [`gsnextract.py`](pywargame/cyberboard/gsnext.py) reads in a
+  CyberBoard Scenario file (`.gsn`) and writes out a ZIP file with
+  images and a JSON file with information about the Scenario, GameBox,
+  and the images.
   
   Pieces (units and markers) are saved as PNGs, while the boards are
   saves as SVGs. 
   
-- [`gsnexport.py`](cyberboard/gsnexp.py) reads in a
+- [`gsnexport.py`](pywargame/cyberboard/gsnexp.py) reads in a
   CyberBoard Scenario file (`.gsn`) and generates a (draft) VASSAL
-  module. A Python script can be supplied to patch up the module. 
+  module. A Python script can be supplied to patch up the module.
   
-- [`ztexport.py`](zuntzu/ztexp.py) reads in a ZunTzu game box file
-  (`.ztb`) and generates a (draft) VASSAL module. A Python script can
-  be supplied to patch up the module.
+- [`ztexport.py`](pywargame/zuntzu/ztexp.py) reads in a ZunTzu game
+  box file (`.ztb`) and generates a (draft) VASSAL module. A Python
+  script can be supplied to patch up the module.
   
-- [`wgexport.py`](latex/main.py) reads in a PDF and JSON file created
-  from LaTeX sources using the
+- [`wgexport.py`](pywargame/latex/main.py) reads in a PDF and JSON
+  file created from LaTeX sources using the
   [`wargame`](https://gitlab.com/wargames_tex/wargame_tex) package,
   and generates a (draft) VASSAL module. A Python script can be
   supplied to patch up the module.
+  
+## Installation via `pip` 
 
-## Download 
+Just do 
+
+```
+$ pip install pywargame
+```
+
+## Download as scripts
 
 You can get the scripts in ZIP file 
 
@@ -125,7 +140,8 @@ or individually
 - [requirements.txt][]
 - [README.md][]
 
-or [browse][] the files.
+or [browse][] the files.  Note that these scripts are _standalone_ and
+does not require a module installation of `pywargame`. 
 
 ## Build 
 
@@ -145,15 +161,24 @@ to ensure you have those installed.
 To generate these scripts, do
 
     cd pywargame/vassal     && ./collect.py
+    cd pywargame/vassal     && ./collectmrg.py
+    cd pywargame/vassal     && ./collectpatch.py
+    cd pywargame/vassal     && ./collectdump.py
     cd pywargame/cyberboard && ./collect.py
     cd pywargame/cyberboard && ./collectgbxext.py
     cd pywargame/cyberboard && ./collectgsnext.py
     cd pywargame/cyberboard && ./collectgsnexp.py
+    cd pywargame/zuntzu     && ./collect.py
     cd pywargame/latex      && ./collect.py
+    cp pywargame/vassal/vassal.py .
+    cp pywargame/vassal/vslmerge.py .
+    cp pywargame/vassal/vmodpatch.py .
+    cp pywargame/vassal/vsavdump.py .
     cp pywargame/cyberboard/gbxextract.py .
     cp pywargame/cyberboard/gsnextract.py .
     cp pywargame/cyberboard/gsnexport.py .
-    cp pywargame/latex/wgexport.py . 
+    cp pywargame/zuntzu/ztexport.py .
+    cp pywargame/latex/wgexport.py .     
     
 or simply, on most modern operating systems, 
 
@@ -203,7 +228,7 @@ scenario - can then be merged into one using the
 [`vslmerge.py`](vassal/merge.py) script. 
 
 CyberBoard game boxes and scenarios made with CyberBoard prior to
-version 3.0 are _not_ supported.  You may have some luck  opening first
+version 3.0 are _not_ supported.  You may have some luck  first opening
 the game box and then the scenario with `CBDesign.exe` and
 `CBPlay.exe`, respectively, and saving anew.  Of course, this requires
 an installation of CyberBoard (on Linux, use
@@ -275,6 +300,9 @@ details, if that happens to you.
 
 ## API 
 
+The API documentation is available
+[here](https://wargames_tex.gitlab.io/pywargame).
+
 The module [`vassal`](vassal) allows one to generate a VASSAL module
 programmatically, or to read in a VASSAL module and manipulate it
 programmatically.  It also has features for defining a _save_

{pywargame-0.4.1 → pywargame-0.4.3}/README.md

@@ -7,7 +7,7 @@ Aided Wargaming (CAW).
 
 - [`pywargame`](pywargame) Top of package 
   - [`common`](pywargame/common) Common utilities used by other code.
-  - [`vassal`](pywargame/vassal) Read or write
+  - [`vassal`](pywargame/vassal) Read or write 
     [VASSAL](https://vassalengine.org)
     ([GitHub](https://github.com/vassalengine/vassal)) modules,
     including
@@ -17,7 +17,7 @@ Aided Wargaming (CAW).
   - [`cyberboard`](pywargame/cyberboard) Read
     [CyberBoard](http://cyberboard.norsesoft.com/)
     ([GitHub](https://github.com/CyberBoardPBEM/cbwindows)) GameBox
-    files.
+    and scenario files.
   - [`zuntzu`](pywargame/zuntzu) Convert [ZunTzu](https://zuntzu.com)
     ([GitHub](https://github.com/ZunTzu-Software/ZunTzu)) GameBox to
     VASSAL module.
@@ -28,9 +28,15 @@ Aided Wargaming (CAW).
 
 ## Changes 
 
-The code isn't versioned yet, and therefore the changes are given by
-date. 
-
+- 0.4.3 
+  - Update for CI/CD
+- 0.4.2 
+  - Some fixes for imports 
+  - Scripts done as entry points in `pip` install 
+- 0.4.1 
+  - Some fixes to `pip` releases 
+- 0.4.0
+  - First release via `pip` 
 - 2nd of February, 2024
   - Fix problem with background of maps exported from CyberBoard
     gamebox.  Thanks to @zovs66 for pointing this out. 
@@ -39,47 +45,56 @@ date.
     
 ## Scripts 
 
-- [`vslmerge.py`](vassal/merge.py) merges VASSAL modules and
+- [`vslmerge.py`](pywargame/vassal/merge.py) merges VASSAL modules and
   extensions together into one module.  This is work in progress.
-  Please report any problems you see. 
+  Please report any problems you see.
   
-- [`vmodpatch.py`](vassal/patch.py) patches a VASSAL modules by
-  running a Python script on it.  The input module file is
-  overwritten. 
+- [`vmodpatch.py`](pywargame/vassal/patch.py) patches a VASSAL modules
+  by running a Python script on it.  The input module file is
+  overwritten.
   
-- [`vsavdump.py`](vassal/dumpsave.py) dumps the content of a VASSAL
-  save or log file to standard output. 
+- [`vsavdump.py`](pywargame/vassal/dumpsave.py) dumps the content of a
+  VASSAL save or log file to standard output.
   
-- [`gbxextract.py`](cyberboard/gbxext.py) reads in a CyberBoard
-  GameBox file (`.gbx`) and writes out a ZIP file with images and a
-  JSON file with information about the GameBox and the images. 
+- [`gbxextract.py`](pywargame/cyberboard/gbxext.py) reads in a
+  CyberBoard GameBox file (`.gbx`) and writes out a ZIP file with
+  images and a JSON file with information about the GameBox and the
+  images.
   
   Pieces (units and markers) are saved as PNGs, while the boards are
   saves as SVGs. 
   
-- [`gsnextract.py`](cyberboard/gsnext.py) reads in a CyberBoard
-  Scenario file (`.gsn`) and writes out a ZIP file with images and a
-  JSON file with information about the Scenario, GameBox, and the
-  images.
+- [`gsnextract.py`](pywargame/cyberboard/gsnext.py) reads in a
+  CyberBoard Scenario file (`.gsn`) and writes out a ZIP file with
+  images and a JSON file with information about the Scenario, GameBox,
+  and the images.
   
   Pieces (units and markers) are saved as PNGs, while the boards are
   saves as SVGs. 
   
-- [`gsnexport.py`](cyberboard/gsnexp.py) reads in a
+- [`gsnexport.py`](pywargame/cyberboard/gsnexp.py) reads in a
   CyberBoard Scenario file (`.gsn`) and generates a (draft) VASSAL
-  module. A Python script can be supplied to patch up the module. 
+  module. A Python script can be supplied to patch up the module.
   
-- [`ztexport.py`](zuntzu/ztexp.py) reads in a ZunTzu game box file
-  (`.ztb`) and generates a (draft) VASSAL module. A Python script can
-  be supplied to patch up the module.
+- [`ztexport.py`](pywargame/zuntzu/ztexp.py) reads in a ZunTzu game
+  box file (`.ztb`) and generates a (draft) VASSAL module. A Python
+  script can be supplied to patch up the module.
   
-- [`wgexport.py`](latex/main.py) reads in a PDF and JSON file created
-  from LaTeX sources using the
+- [`wgexport.py`](pywargame/latex/main.py) reads in a PDF and JSON
+  file created from LaTeX sources using the
   [`wargame`](https://gitlab.com/wargames_tex/wargame_tex) package,
   and generates a (draft) VASSAL module. A Python script can be
   supplied to patch up the module.
+  
+## Installation via `pip` 
 
-## Download 
+Just do 
+
+```
+$ pip install pywargame
+```
+
+## Download as scripts
 
 You can get the scripts in ZIP file 
 
@@ -100,7 +115,8 @@ or individually
 - [requirements.txt][]
 - [README.md][]
 
-or [browse][] the files.
+or [browse][] the files.  Note that these scripts are _standalone_ and
+does not require a module installation of `pywargame`. 
 
 ## Build 
 
@@ -120,15 +136,24 @@ to ensure you have those installed.
 To generate these scripts, do
 
     cd pywargame/vassal     && ./collect.py
+    cd pywargame/vassal     && ./collectmrg.py
+    cd pywargame/vassal     && ./collectpatch.py
+    cd pywargame/vassal     && ./collectdump.py
     cd pywargame/cyberboard && ./collect.py
     cd pywargame/cyberboard && ./collectgbxext.py
     cd pywargame/cyberboard && ./collectgsnext.py
     cd pywargame/cyberboard && ./collectgsnexp.py
+    cd pywargame/zuntzu     && ./collect.py
     cd pywargame/latex      && ./collect.py
+    cp pywargame/vassal/vassal.py .
+    cp pywargame/vassal/vslmerge.py .
+    cp pywargame/vassal/vmodpatch.py .
+    cp pywargame/vassal/vsavdump.py .
     cp pywargame/cyberboard/gbxextract.py .
     cp pywargame/cyberboard/gsnextract.py .
     cp pywargame/cyberboard/gsnexport.py .
-    cp pywargame/latex/wgexport.py . 
+    cp pywargame/zuntzu/ztexport.py .
+    cp pywargame/latex/wgexport.py .     
     
 or simply, on most modern operating systems, 
 
@@ -178,7 +203,7 @@ scenario - can then be merged into one using the
 [`vslmerge.py`](vassal/merge.py) script. 
 
 CyberBoard game boxes and scenarios made with CyberBoard prior to
-version 3.0 are _not_ supported.  You may have some luck  opening first
+version 3.0 are _not_ supported.  You may have some luck  first opening
 the game box and then the scenario with `CBDesign.exe` and
 `CBPlay.exe`, respectively, and saving anew.  Of course, this requires
 an installation of CyberBoard (on Linux, use
@@ -250,6 +275,9 @@ details, if that happens to you.
 
 ## API 
 
+The API documentation is available
+[here](https://wargames_tex.gitlab.io/pywargame).
+
 The module [`vassal`](vassal) allows one to generate a VASSAL module
 programmatically, or to read in a VASSAL module and manipulate it
 programmatically.  It also has features for defining a _save_

pywargame-0.4.3/pywargame/__init__.py

@@ -0,0 +1,8 @@
+'''Top-level module'''
+version = '0.4.3'
+
+import pywargame.common     
+import pywargame.vassal     
+import pywargame.cyberboard 
+import pywargame.zuntzu     
+import pywargame.latex      

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/common/__init__.py

@@ -1,3 +1,6 @@
+'''Common utilites
+
+'''
 from . singleton import Singleton
 from . verbose import Verbose
 from . verboseguard import VerboseGuard

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/common/drawdice.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
-if __name__ == '__main__':
+# --------------------------------------------------------------------
+def diceMain():
     from sys import path
     
     from argparse import ArgumentParser
-    from dicedraw import DiceDrawer
+    from pywargame.common.dicedraw import DiceDrawer
 
     ap = ArgumentParser(description='Make a series of dice images')
     ap.add_argument('-n','--sides', choices=[4,6,8,10,12,20],
@@ -35,6 +36,14 @@ if __name__ == '__main__':
                 range(1,args.sides+1))
     for val in vals:
         dd.draw(val).save(filename=base.format(sides=args.sides,value=val))
+    
+# --------------------------------------------------------------------
+if __name__ == '__main__':
+    diceMain()
+
+# --------------------------------------------------------------------
+#
+# EOF
+#
 
-        
     

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/common/test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from verboseguard import VerboseGuard
-from verbose import Verbose
+from . verboseguard import VerboseGuard
+from . verbose import Verbose
 
 def inner():
     with VerboseGuard('Entering inner') as g:

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/cyberboard/gbxext.py

@@ -5,17 +5,16 @@
 #    https://github.com/CyberBoardPBEM/cbwindows
 #
 #
-
+## BEGIN_IMPORT
+from pywargame.cyberboard.gamebox   import GameBox
+from pywargame.cyberboard.extractor import GBXExtractor
+from pywargame.common               import Verbose
+## END_IMPORT
 
 # ====================================================================
-if __name__ == '__main__':
+def extractMain():
     from argparse import ArgumentParser, FileType
     from pathlib import Path
-## BEGIN_IMPORT
-    from gamebox   import GameBox
-    from extractor import GBXExtractor
-    from common    import Verbose
-## END_IMPORT
 
     ap = ArgumentParser(description='Extract information from a '
                         'CyberBoard GameBox file and store in ZIP archive',
@@ -58,7 +57,12 @@ if __name__ == '__main__':
         print(rat)
     if 'gbx' in args.dump:
         print(gbx)
-
     
 
-    
+# ====================================================================
+if __name__ == '__main__':
+    extractMain()
+
+#
+# EOF
+#

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/cyberboard/gsnexp.py

@@ -1,16 +1,14 @@
 #!/usr/bin/env python
+## BEGIN_IMPORTS
+from pywargame.common     import Verbose
+from pywargame.cyberboard.exporter    import GSNExporter
+from pywargame.cyberboard.scenario    import Scenario
+from pywargame.cyberboard.extractor   import GSNExtractor
+from pywargame.cyberboard.head        import GBXHeader
+## END_IMPORTS
 
 # ====================================================================
-def gsnexp():
-    ## BEGIN_IMPORTS
-    from sys import path
-    path.append('..')
-    from pywargame.common     import Verbose
-    from pywargame.cyberboard.exporter    import GSNExporter
-    from pywargame.cyberboard.scenario    import Scenario
-    from pywargame.cyberboard.extractor   import GSNExtractor
-    from pywargame.cyberboard.head        import GBXHeader
-    ## END_IMPORTS
+def exportMain():
     
     from argparse import ArgumentParser, FileType, \
          RawDescriptionHelpFormatter 
@@ -147,5 +145,12 @@ def gsnexp():
         raise e
 
 
+# ====================================================================
 if __name__ == '__main__':
     gsnexp()
+
+# ====================================================================
+#
+# EOF
+#
+

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/cyberboard/gsnext.py

@@ -5,17 +5,18 @@
 #    https://github.com/CyberBoardPBEM/cbwindows
 #
 #
-
+# ====================================================================
+## BEGIN_IMPORT
+from pywargame.cyberboard.scenario  import Scenario
+from pywargame.cyberboard.extractor import GSNExtractor
+from pywargame.common               import Verbose
+## END_IMPORT
+    
 
 # ====================================================================
-def gsnext():
+def extractMain():
     from argparse import ArgumentParser, FileType
     from pathlib import Path
-## BEGIN_IMPORT
-    from pywargame.cyberboard.scenario  import Scenario
-    from pywargame.cyberboard.extractor import GSNExtractor
-    from pywargame.common               import Verbose
-## END_IMPORT
 
     ap = ArgumentParser(description='Extract information from a '
                         'CyberBoard Scenario file and store in ZIP archive',
@@ -50,6 +51,7 @@ def gsnext():
     if 'gsn' in args.dump:
         print(gsn)
 
+# ====================================================================
 if __name__ == '__main__':
     gsnext()
     

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/cyberboard/testgrid.py

@@ -146,7 +146,8 @@ def testall():
 
 
 
-testall()
+if __name__ == '__main__':
+    testall()
     
     
                 

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/cyberboard/zeropwd.py

@@ -1,12 +1,14 @@
 #!/usr/bin/env python
 ## BEGIN_IMPORT
-from gamebox import GBXInfo
-from head    import GBXHeader
-from archive import Archive
+from pywargame.cyberboard.gamebox import GBXInfo
+from pywargame.cyberboard.head    import GBXHeader
+from pywargame.cyberboard.archive import Archive
 ## END_IMPORT
 
+# --------------------------------------------------------------------
 nullpwd = b'\xee\n\xcbg\xbc\xdb\x92\x1a\x0c\xd2\xf1y\x83*\x96\xc9'
 
+# --------------------------------------------------------------------
 def zeropwd(filename):
     from pathlib import Path
     
@@ -14,9 +16,7 @@ def zeropwd(filename):
     with Archive(filename,'rb') as ar:
         header       = GBXHeader(ar,GBXHeader.BOX)
         box          = GBXInfo(ar)
-
-
-        pos = ar.tell() - 4*2 - 2 - 2 - 16
+        pos          = ar.tell() - 4*2 - 2 - 2 - 16
 
     with open(filename,'rb') as file:
         cnt = file.read()
@@ -31,15 +31,22 @@ def zeropwd(filename):
     with open(on,'wb') as file:
         file.write(ncnt)
 
-
-if __name__ == '__main__':
+# --------------------------------------------------------------------
+def zeroPwdMain():        
     from argparse import ArgumentParser, FileType
     ap = ArgumentParser(description='Disable password in gamebox')
-    ap.add_argument('input', type=str, help='The file')
+    ap.add_argument('input', type=str, help='The game box file')
 
     args = ap.parse_args()
 
     zeropwd(args.input)
+
+# --------------------------------------------------------------------
+if __name__ == '__main__':
+    zeroPwdMain()
     
-    
-    
+# --------------------------------------------------------------------
+#
+# EOF
+#
+

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/latex/latexexporter.py

@@ -1,11 +1,11 @@
 ## BEGIN_IMPORTS
-from common import VerboseGuard, Verbose
-from vassal.buildfile import BuildFile
-from vassal.documentation import Documentation
-from vassal.traits import *
-from vassal.base import *
-from vassal.moduledata import ModuleData
-from vassal.exporter import Exporter
+from .. common import VerboseGuard, Verbose
+from .. vassal.buildfile import BuildFile
+from .. vassal.documentation import Documentation
+from .. vassal.traits import *
+from .. vassal.base import *
+from .. vassal.moduledata import ModuleData
+from .. vassal.exporter import Exporter
 from pprint import pprint
 
 ## END_IMPORTS

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/latex/main.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 ## BEGIN_IMPORTS
-from latexexporter import LaTeXExporter
-from vassal.vmod import VMod
-from common import Verbose
+from pywargame.latex.latexexporter import LaTeXExporter
+from pywargame.vassal.vmod import VMod
+from pywargame.common import Verbose
 ## END_IMPORTS
 
 from argparse import ArgumentParser
@@ -88,9 +88,9 @@ def exportIt(args):
         
         raise e
     
-    
+
 # ====================================================================
-if __name__ == '__main__':
+def exportMain():
     from argparse import ArgumentParser, FileType
 
     ap = DefaultSubcommandArgParse(description='Create draft VASSAL module')
@@ -178,7 +178,11 @@ if __name__ == '__main__':
         patchIt(args)
     else:
         exportIt(args)
-        
+    
+# ====================================================================
+if __name__ == '__main__':
+    exportMain()
+    
 #
 # EOF
 #

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/vassal/__init__.py

@@ -64,3 +64,4 @@ from . save import *
 from . vsav import *
 from . vmod import *
 from . exporter import *
+from . merger import Merger

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/vassal/buildfile.py

@@ -3,7 +3,7 @@ from .. common import VerboseGuard
 from . base import *
 from . element import Element
 from . game import Game
-from . xml import xmlns
+from . xmlns import xmlns
 ## END_IMPORT
 
 # --------------------------------------------------------------------

{pywargame-0.4.1 → pywargame-0.4.3}/pywargame/vassal/collect.py

@@ -28,7 +28,7 @@ if __name__ == '__main__':
           '../common/verbose.py',
           '../common/verboseguard.py',
           '../common/dicedraw.py',
-          'xml.py',
+          'xmlns.py',
           'base.py',
           'element.py',
           'folder.py',
@@ -93,6 +93,7 @@ if __name__ == '__main__':
           'vsav.py',
           'vmod.py',
           'upgrade.py',
-          'exporter.py')
+          'exporter.py',
+          'merger.py')