pywargame 0.3.1__py3-none-any.whl → 0.4.1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (112) hide show
  1. pywargame/common/dicedraw.py +6 -1
  2. pywargame/cyberboard/__init__.py +2 -0
  3. pywargame/cyberboard/archive.py +2 -2
  4. pywargame/cyberboard/base.py +2 -1
  5. pywargame/cyberboard/board.py +3 -1
  6. pywargame/cyberboard/cell.py +2 -1
  7. pywargame/cyberboard/draw.py +2 -1
  8. pywargame/cyberboard/exporter.py +8 -7
  9. pywargame/cyberboard/extractor.py +1 -1
  10. pywargame/cyberboard/features.py +1 -1
  11. pywargame/cyberboard/gamebox.py +1 -1
  12. pywargame/cyberboard/gsnexp.py +14 -10
  13. pywargame/cyberboard/gsnext.py +7 -4
  14. pywargame/cyberboard/head.py +2 -1
  15. pywargame/cyberboard/image.py +1 -1
  16. pywargame/cyberboard/mark.py +1 -1
  17. pywargame/cyberboard/palette.py +2 -1
  18. pywargame/cyberboard/piece.py +2 -1
  19. pywargame/cyberboard/player.py +1 -1
  20. pywargame/cyberboard/scenario.py +1 -1
  21. pywargame/cyberboard/tile.py +2 -1
  22. pywargame/cyberboard/tray.py +2 -1
  23. pywargame/cyberboard/windows.py +1 -1
  24. pywargame/gsnexport.py +52 -4
  25. pywargame/gsnextract.py +4 -1
  26. pywargame/vassal/__init__.py +2 -2
  27. pywargame/vassal/board.py +1 -1
  28. pywargame/vassal/buildfile.py +2 -1
  29. pywargame/vassal/chart.py +1 -1
  30. pywargame/vassal/chessclock.py +1 -1
  31. pywargame/vassal/collect.py +1 -1
  32. pywargame/vassal/collectpatch.py +2 -2
  33. pywargame/vassal/command.py +1 -1
  34. pywargame/vassal/documentation.py +1 -1
  35. pywargame/vassal/dumpvsav.py +1 -1
  36. pywargame/vassal/element.py +2 -1
  37. pywargame/vassal/exporter.py +2 -2
  38. pywargame/vassal/extension.py +1 -1
  39. pywargame/vassal/folder.py +1 -1
  40. pywargame/vassal/game.py +1 -1
  41. pywargame/vassal/gameelements.py +1 -1
  42. pywargame/vassal/globalproperty.py +1 -1
  43. pywargame/vassal/grid.py +1 -1
  44. pywargame/vassal/map.py +1 -1
  45. pywargame/vassal/mapelements.py +1 -1
  46. pywargame/vassal/merge.py +2 -2
  47. pywargame/vassal/merger.py +1 -1
  48. pywargame/vassal/moduledata.py +2 -1
  49. pywargame/vassal/patch.py +2 -2
  50. pywargame/vassal/player.py +1 -1
  51. pywargame/vassal/skel.py +1 -1
  52. pywargame/vassal/traits/__init__.py +1 -1
  53. pywargame/vassal/traits/area.py +1 -1
  54. pywargame/vassal/traits/basic.py +1 -1
  55. pywargame/vassal/traits/calculatedproperty.py +1 -1
  56. pywargame/vassal/traits/cargo.py +1 -1
  57. pywargame/vassal/traits/click.py +1 -1
  58. pywargame/vassal/traits/clone.py +1 -1
  59. pywargame/vassal/traits/delete.py +1 -1
  60. pywargame/vassal/traits/deselect.py +1 -1
  61. pywargame/vassal/traits/dynamicproperty.py +1 -1
  62. pywargame/vassal/traits/globalcommand.py +1 -1
  63. pywargame/vassal/traits/globalhotkey.py +1 -1
  64. pywargame/vassal/traits/globalproperty.py +1 -1
  65. pywargame/vassal/traits/hide.py +1 -1
  66. pywargame/vassal/traits/label.py +1 -1
  67. pywargame/vassal/traits/layer.py +1 -1
  68. pywargame/vassal/traits/mark.py +1 -1
  69. pywargame/vassal/traits/mask.py +1 -1
  70. pywargame/vassal/traits/mat.py +1 -1
  71. pywargame/vassal/traits/moved.py +1 -1
  72. pywargame/vassal/traits/movefixed.py +1 -1
  73. pywargame/vassal/traits/nonrect.py +1 -1
  74. pywargame/vassal/traits/nostack.py +1 -1
  75. pywargame/vassal/traits/place.py +1 -1
  76. pywargame/vassal/traits/prototype.py +1 -1
  77. pywargame/vassal/traits/report.py +1 -1
  78. pywargame/vassal/traits/restrictaccess.py +1 -1
  79. pywargame/vassal/traits/restrictcommand.py +1 -1
  80. pywargame/vassal/traits/{return.py → retrn.py} +1 -1
  81. pywargame/vassal/traits/rotate.py +1 -1
  82. pywargame/vassal/traits/sendto.py +1 -1
  83. pywargame/vassal/traits/sheet.py +1 -1
  84. pywargame/vassal/traits/skel.py +1 -1
  85. pywargame/vassal/traits/stack.py +1 -1
  86. pywargame/vassal/traits/submenu.py +1 -1
  87. pywargame/vassal/traits/trail.py +1 -1
  88. pywargame/vassal/traits/trigger.py +1 -1
  89. pywargame/vassal/turn.py +1 -1
  90. pywargame/vassal/upgrade.py +1 -1
  91. pywargame/vassal/vmod.py +45 -1
  92. pywargame/vassal/widget.py +1 -1
  93. pywargame/vassal/withtraits.py +1 -1
  94. pywargame/vassal/zone.py +1 -1
  95. pywargame/vassal.py +47 -3
  96. pywargame/vmodpatch.py +47 -3
  97. pywargame/vsavdump.py +47 -3
  98. pywargame/vslmerge.py +47 -3
  99. pywargame/wgexport.py +47 -3
  100. pywargame/ztexport.py +47 -3
  101. pywargame/zuntzu/countersheet.py +3 -3
  102. pywargame/zuntzu/dicehand.py +2 -2
  103. pywargame/zuntzu/exporter.py +10 -10
  104. pywargame/zuntzu/gamebox.py +7 -7
  105. pywargame/zuntzu/map.py +2 -2
  106. pywargame/zuntzu/scenario.py +2 -2
  107. {pywargame-0.3.1.dist-info → pywargame-0.4.1.dist-info}/METADATA +1 -1
  108. pywargame-0.4.1.dist-info/RECORD +150 -0
  109. pywargame-0.3.1.dist-info/RECORD +0 -150
  110. {pywargame-0.3.1.dist-info → pywargame-0.4.1.dist-info}/WHEEL +0 -0
  111. {pywargame-0.3.1.dist-info → pywargame-0.4.1.dist-info}/licenses/LICENSE +0 -0
  112. {pywargame-0.3.1.dist-info → pywargame-0.4.1.dist-info}/top_level.txt +0 -0
@@ -288,7 +288,12 @@ class DiceDrawer:
288
288
  path.line(to=(0.0000,0.2920))
289
289
 
290
290
 
291
- draw.number(num,yoff=.07,scale=.7)
291
+ scale = .7
292
+ yoff = .07
293
+ if num > 9:
294
+ scale *= .8
295
+ yoff = .015
296
+ draw.number(num,yoff=yoff,scale=scale)
292
297
  return draw.image()
293
298
 
294
299
 
@@ -15,4 +15,6 @@ from . windows import *
15
15
  from . palette import *
16
16
  from . tray import *
17
17
  from . extractor import *
18
+ from . exporter import *
19
+
18
20
 
@@ -1,6 +1,6 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
3
- from common import Verbose
2
+ from .. common import VerboseGuard
3
+ from .. common import Verbose
4
4
  from . features import Features
5
5
  ## END_IMPORT
6
6
 
@@ -1,5 +1,6 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
+ from . features import Features
3
4
  ## END_IMPORT
4
5
 
5
6
  # --------------------------------------------------------------------
@@ -1,9 +1,11 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . draw import GBXDrawList
4
4
  from . cell import GBXCell, GBXCellGeometry
5
5
  from . base import CbManager, CbFont
6
6
  from . head import num_version
7
+ from . features import Features
8
+ from . draw import GBXDraw
7
9
  ## END_IMPORT
8
10
 
9
11
  # --------------------------------------------------------------------
@@ -1,7 +1,8 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . image import GBXImage
4
4
  from . draw import GBXDraw
5
+ from . features import Features
5
6
  ## END_IMPORT
6
7
 
7
8
  # ====================================================================
@@ -1,7 +1,8 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . image import GBXImage
4
4
  from . base import CbFont
5
+ from . features import Features
5
6
  ## END_IMPORT
6
7
 
7
8
  # ====================================================================
@@ -1,11 +1,12 @@
1
1
  ## BEGIN_IMPORTS
2
- from common import VerboseGuard, Verbose
3
- from vassal.buildfile import BuildFile
4
- from vassal.documentation import Documentation
5
- from vassal.traits import *
6
- from vassal.base import *
7
- from vassal.moduledata import ModuleData
8
- from vassal.exporter import Exporter
2
+ from .. common import VerboseGuard, Verbose
3
+ from .. vassal.buildfile import BuildFile
4
+ from .. vassal.documentation import Documentation
5
+ from .. vassal.traits import *
6
+ from .. vassal.base import *
7
+ from .. vassal.moduledata import ModuleData
8
+ from .. vassal.exporter import Exporter
9
+ from .. vassal.mapelements import LayerControl
9
10
  ## END_IMPORTS
10
11
 
11
12
  class CbExporter(Exporter):
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  ## END_IMPORT
4
4
 
5
5
  # ====================================================================
@@ -1,6 +1,6 @@
1
1
  # --------------------------------------------------------------------
2
2
  ## BEGIN_IMPORT
3
- from common.singleton import Singleton
3
+ from .. common.singleton import Singleton
4
4
  ## END_IMPORT
5
5
 
6
6
  class Features(metaclass=Singleton):
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . head import *
4
4
  from . tile import GBXTileManager
5
5
  from . piece import GBXPieceManager
@@ -1,16 +1,17 @@
1
1
  #!/usr/bin/env python
2
- ## BEGIN_IMPORTS
3
- from sys import path
4
- path.append('..')
5
- from exporter import GSNExporter
6
- from common import Verbose
7
- from scenario import Scenario
8
- from extractor import GSNExtractor
9
- from head import GBXHeader
10
- ## END_IMPORTS
11
2
 
12
3
  # ====================================================================
13
- if __name__ == '__main__':
4
+ def gsnexp():
5
+ ## BEGIN_IMPORTS
6
+ from sys import path
7
+ path.append('..')
8
+ from pywargame.common import Verbose
9
+ from pywargame.cyberboard.exporter import GSNExporter
10
+ from pywargame.cyberboard.scenario import Scenario
11
+ from pywargame.cyberboard.extractor import GSNExtractor
12
+ from pywargame.cyberboard.head import GBXHeader
13
+ ## END_IMPORTS
14
+
14
15
  from argparse import ArgumentParser, FileType, \
15
16
  RawDescriptionHelpFormatter
16
17
  from textwrap import wrap, dedent
@@ -145,3 +146,6 @@ if __name__ == '__main__':
145
146
 
146
147
  raise e
147
148
 
149
+
150
+ if __name__ == '__main__':
151
+ gsnexp()
@@ -8,13 +8,13 @@
8
8
 
9
9
 
10
10
  # ====================================================================
11
- if __name__ == '__main__':
11
+ def gsnext():
12
12
  from argparse import ArgumentParser, FileType
13
13
  from pathlib import Path
14
14
  ## BEGIN_IMPORT
15
- from scenario import Scenario
16
- from extractor import GSNExtractor
17
- from common import Verbose
15
+ from pywargame.cyberboard.scenario import Scenario
16
+ from pywargame.cyberboard.extractor import GSNExtractor
17
+ from pywargame.common import Verbose
18
18
  ## END_IMPORT
19
19
 
20
20
  ap = ArgumentParser(description='Extract information from a '
@@ -50,6 +50,9 @@ if __name__ == '__main__':
50
50
  if 'gsn' in args.dump:
51
51
  print(gsn)
52
52
 
53
+ if __name__ == '__main__':
54
+ gsnext()
55
+
53
56
  #
54
57
  # EOF
55
58
  #
@@ -1,6 +1,7 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . archive import Archive
4
+ from . features import Features
4
5
  ## END_IMPORT
5
6
 
6
7
  def num_version(major,minor):
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  ## END_IMPORT
4
4
 
5
5
  # ====================================================================
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import CbManager
4
4
  ## END_IMPORT
5
5
 
@@ -1,6 +1,7 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . head import num_version, readVector
4
+ from . features import Features
4
5
  ## END_IMPORT
5
6
 
6
7
  class GSNPalette:
@@ -1,6 +1,7 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . head import num_version
4
+ from . features import Features
4
5
  ## END_IMPORT
5
6
  # ====================================================================
6
7
  class GBXPieceDef:
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  ## END_IMPORT
4
4
 
5
5
  class GSNPlayerManager:
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . head import *
4
4
  from . player import GSNPlayerManager
5
5
  from . windows import GSNWindows
@@ -1,7 +1,8 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . image import GBXImage
4
4
  from . base import CbManager
5
+ from . features import Features
5
6
  ## END_IMPORT
6
7
 
7
8
  # ====================================================================
@@ -1,6 +1,7 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . head import num_version, readVector
4
+ from . features import Features
4
5
  ## END_IMPORT
5
6
 
6
7
  class GSNTraySet:
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  ## END_IMPORT
4
4
 
5
5
  class GSNWindow:
pywargame/gsnexport.py CHANGED
@@ -71,7 +71,7 @@
71
71
  # traits/movefixed.py
72
72
  # traits/sheet.py
73
73
  # traits/hide.py
74
- # traits/return.py
74
+ # traits/retrn.py
75
75
  # game.py
76
76
  # buildfile.py
77
77
  # moduledata.py
@@ -507,7 +507,12 @@ class DiceDrawer:
507
507
  path.line(to=(0.0000,0.2920))
508
508
 
509
509
 
510
- draw.number(num,yoff=.07,scale=.7)
510
+ scale = .7
511
+ yoff = .07
512
+ if num > 9:
513
+ scale *= .8
514
+ yoff = .015
515
+ draw.number(num,yoff=yoff,scale=scale)
511
516
  return draw.image()
512
517
 
513
518
 
@@ -10041,7 +10046,7 @@ Trait.known_traits.append(HideTrait)
10041
10046
  # EOF
10042
10047
  #
10043
10048
  # ====================================================================
10044
- # From traits/return.py
10049
+ # From traits/retrn.py
10045
10050
 
10046
10051
  # --------------------------------------------------------------------
10047
10052
  class ReturnTrait(Trait):
@@ -12233,6 +12238,45 @@ class VMod:
12233
12238
  moduleData.encode()})
12234
12239
 
12235
12240
 
12241
+ @classmethod
12242
+ def patchFunction(cls,vmod_filename,patch,verbose):
12243
+ '''Patch a module with a Python script
12244
+
12245
+ Parameters
12246
+ ----------
12247
+ vmod_filename : str
12248
+ File name of module to patch. Will be overwritten
12249
+ patch : callable
12250
+ A callable to patch the VMod. It must have signature
12251
+
12252
+ patch(buildFile : pywargames.vassal.BuildFile,
12253
+ moduleData : pywargames.vassal.ModuleData,
12254
+ vmod : pywargames.vassal.VMod
12255
+ verbose : boolean)
12256
+
12257
+ verbose : bool
12258
+ Whether to be verbose or not
12259
+ '''
12260
+
12261
+ with cls(vmod_filename,'r') as vmod:
12262
+ buildFile = BuildFile(vmod.getBuildFile())
12263
+ moduleData = ModuleData(vmod.getModuleData())
12264
+
12265
+ with cls(vmod_filename,'a') as vmod:
12266
+ try:
12267
+ patch(buildFile,
12268
+ moduleData,
12269
+ vmod,
12270
+ verbose)
12271
+
12272
+ vmod.replaceFiles(**{VMod.BUILD_FILE :
12273
+ buildFile.encode(),
12274
+ VMod.MODULE_DATA :
12275
+ moduleData.encode()})
12276
+ except Exception as e:
12277
+ raise
12278
+
12279
+
12236
12280
  #
12237
12281
  # EOF
12238
12282
  #
@@ -16359,7 +16403,8 @@ class GSNExporter(CbExporter):
16359
16403
  # From gsnexp.py
16360
16404
 
16361
16405
  # ====================================================================
16362
- if __name__ == '__main__':
16406
+ def gsnexp():
16407
+
16363
16408
  from argparse import ArgumentParser, FileType, \
16364
16409
  RawDescriptionHelpFormatter
16365
16410
  from textwrap import wrap, dedent
@@ -16494,6 +16539,9 @@ if __name__ == '__main__':
16494
16539
 
16495
16540
  raise e
16496
16541
 
16542
+
16543
+ if __name__ == '__main__':
16544
+ gsnexp()
16497
16545
  ##
16498
16546
  # End of generated script
16499
16547
  ##
pywargame/gsnextract.py CHANGED
@@ -2741,7 +2741,7 @@ class GSNExtractor(CbExtractor):
2741
2741
 
2742
2742
 
2743
2743
  # ====================================================================
2744
- if __name__ == '__main__':
2744
+ def gsnext():
2745
2745
  from argparse import ArgumentParser, FileType
2746
2746
  from pathlib import Path
2747
2747
 
@@ -2778,6 +2778,9 @@ if __name__ == '__main__':
2778
2778
  if 'gsn' in args.dump:
2779
2779
  print(gsn)
2780
2780
 
2781
+ if __name__ == '__main__':
2782
+ gsnext()
2783
+
2781
2784
  #
2782
2785
  # EOF
2783
2786
  #
@@ -54,9 +54,9 @@ from . traits.click import *
54
54
  from . traits.mat import MatTrait
55
55
  from . traits.cargo import CargoTrait
56
56
  from . traits.movefixed import MoveFixedTrait
57
- from . traits.sheet import SheeTrait
57
+ from . traits.sheet import SheetTrait
58
58
  from . traits.hide import HideTrait
59
- from . traits.return import ReturnTrait
59
+ from . traits.retrn import ReturnTrait
60
60
  from . game import *
61
61
  from . buildfile import *
62
62
  from . moduledata import *
pywargame/vassal/board.py CHANGED
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . gameelements import GameElement
@@ -1,8 +1,9 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . game import Game
6
+ from . xml import xmlns
6
7
  ## END_IMPORT
7
8
 
8
9
  # --------------------------------------------------------------------
pywargame/vassal/chart.py CHANGED
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . gameelements import GameElement
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . gameelements import GameElement
@@ -85,7 +85,7 @@ if __name__ == '__main__':
85
85
  'traits/movefixed.py',
86
86
  'traits/sheet.py',
87
87
  'traits/hide.py',
88
- 'traits/return.py',
88
+ 'traits/retrn.py',
89
89
  'game.py',
90
90
  'buildfile.py',
91
91
  'moduledata.py',
@@ -2,8 +2,8 @@
2
2
  import sys
3
3
  sys.path.append('..')
4
4
 
5
- from common import Verbose, VerboseGuard
6
- from common.collector import Collector
5
+ from .. common import Verbose, VerboseGuard
6
+ from .. common.collector import Collector
7
7
 
8
8
 
9
9
  if __name__ == '__main__':
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  ## END_IMPORT
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . gameelements import GameElement
@@ -1,6 +1,6 @@
1
1
  #!/usr/bin/env python
2
2
  ## BEGIN_IMPORT
3
- from vassal import SaveIO
3
+ from . import SaveIO
4
4
  ## END_IMPORT
5
5
 
6
6
  if __name__ == '__main__':
@@ -1,6 +1,7 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
+ from . xml import xmlns
4
5
  ## END_IMPORT
5
6
 
6
7
  # ====================================================================
@@ -1,6 +1,6 @@
1
1
  ## BEGIN_IMPORT
2
- from vassal.vmod import VMod
3
- from common import VerboseGuard, Verbose
2
+ from . vmod import VMod
3
+ from .. common import VerboseGuard, Verbose
4
4
  ## END_IMPORT
5
5
 
6
6
  class Exporter:
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . game import Game
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  ## END_IMPORT
pywargame/vassal/game.py CHANGED
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . documentation import Documentation
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . withtraits import *
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  ## END_IMPORT
pywargame/vassal/grid.py CHANGED
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  ## END_IMPORT
pywargame/vassal/map.py CHANGED
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . mapelements import *
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . withtraits import *
pywargame/vassal/merge.py CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env python
2
2
  ## BEGIN_IMPORTS
3
- from vassal import Merger
4
- from common import Verbose
3
+ from . import Merger
4
+ from .. common import Verbose
5
5
  ## END_IMPORTS
6
6
 
7
7
 
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . extension import *
@@ -1,7 +1,8 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
+ from . xml import xmlns
5
6
  ## END_IMPORT
6
7
 
7
8
  # --------------------------------------------------------------------
pywargame/vassal/patch.py CHANGED
@@ -2,8 +2,8 @@
2
2
  #
3
3
  # Patch a module
4
4
  ## BEGIN_IMPORTS
5
- from vassal.vmod import VMod
6
- from common import Verbose
5
+ from . vmod import VMod
6
+ from .. common import Verbose
7
7
  ## END_IMPORT
8
8
 
9
9
  # ====================================================================
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  from . gameelements import GameElement
pywargame/vassal/skel.py CHANGED
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from .. common import VerboseGuard
3
3
  from . base import *
4
4
  from . element import Element
5
5
  ## END_IMPORT
@@ -33,4 +33,4 @@ from . cargo import CargoTrait
33
33
  from . movefixed import MoveFixedTrait
34
34
  from . sheet import SheetTrait
35
35
  from . hide import HideTrait
36
- from . return import ReturnTrait
36
+ from . retrn import ReturnTrait
@@ -1,5 +1,5 @@
1
1
  ## BEGIN_IMPORT
2
- from common import VerboseGuard
2
+ from ... common import VerboseGuard
3
3
  from .. trait import Trait
4
4
  from .. base import rgb, key
5
5
  ## END_IMPORT