pywargame 0.3.1__py3-none-any.whl → 0.4.2__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 (131) hide show
  1. pywargame/__init__.py +7 -1
  2. pywargame/common/__init__.py +3 -0
  3. pywargame/common/dicedraw.py +6 -1
  4. pywargame/common/drawdice.py +12 -3
  5. pywargame/common/test.py +2 -2
  6. pywargame/cyberboard/__init__.py +2 -0
  7. pywargame/cyberboard/archive.py +2 -2
  8. pywargame/cyberboard/base.py +2 -1
  9. pywargame/cyberboard/board.py +3 -1
  10. pywargame/cyberboard/cell.py +2 -1
  11. pywargame/cyberboard/draw.py +2 -1
  12. pywargame/cyberboard/exporter.py +8 -7
  13. pywargame/cyberboard/extractor.py +1 -1
  14. pywargame/cyberboard/features.py +1 -1
  15. pywargame/cyberboard/gamebox.py +1 -1
  16. pywargame/cyberboard/gbxext.py +13 -9
  17. pywargame/cyberboard/gsnexp.py +17 -8
  18. pywargame/cyberboard/gsnext.py +12 -7
  19. pywargame/cyberboard/head.py +2 -1
  20. pywargame/cyberboard/image.py +1 -1
  21. pywargame/cyberboard/mark.py +1 -1
  22. pywargame/cyberboard/palette.py +2 -1
  23. pywargame/cyberboard/piece.py +2 -1
  24. pywargame/cyberboard/player.py +1 -1
  25. pywargame/cyberboard/scenario.py +1 -1
  26. pywargame/cyberboard/testgrid.py +2 -1
  27. pywargame/cyberboard/tile.py +2 -1
  28. pywargame/cyberboard/tray.py +2 -1
  29. pywargame/cyberboard/windows.py +1 -1
  30. pywargame/cyberboard/zeropwd.py +18 -11
  31. pywargame/latex/latexexporter.py +7 -7
  32. pywargame/latex/main.py +10 -6
  33. pywargame/vassal/__init__.py +3 -2
  34. pywargame/vassal/board.py +1 -1
  35. pywargame/vassal/buildfile.py +2 -1
  36. pywargame/vassal/chart.py +1 -1
  37. pywargame/vassal/chessclock.py +1 -1
  38. pywargame/vassal/collect.py +4 -3
  39. pywargame/vassal/command.py +1 -1
  40. pywargame/vassal/documentation.py +1 -1
  41. pywargame/vassal/dumpvsav.py +7 -2
  42. pywargame/vassal/element.py +2 -1
  43. pywargame/vassal/exporter.py +2 -2
  44. pywargame/vassal/extension.py +1 -1
  45. pywargame/vassal/folder.py +1 -1
  46. pywargame/vassal/game.py +1 -1
  47. pywargame/vassal/gameelements.py +29 -12
  48. pywargame/vassal/globalproperty.py +1 -1
  49. pywargame/vassal/grid.py +1 -1
  50. pywargame/vassal/map.py +1 -1
  51. pywargame/vassal/mapelements.py +1 -1
  52. pywargame/vassal/merge.py +8 -5
  53. pywargame/vassal/merger.py +1 -1
  54. pywargame/vassal/moduledata.py +2 -1
  55. pywargame/vassal/patch.py +8 -5
  56. pywargame/vassal/player.py +1 -1
  57. pywargame/vassal/trait.py +13 -10
  58. pywargame/vassal/traits/__init__.py +1 -1
  59. pywargame/vassal/traits/area.py +5 -3
  60. pywargame/vassal/traits/basic.py +1 -1
  61. pywargame/vassal/traits/calculatedproperty.py +1 -1
  62. pywargame/vassal/traits/cargo.py +4 -1
  63. pywargame/vassal/traits/click.py +1 -1
  64. pywargame/vassal/traits/clone.py +1 -1
  65. pywargame/vassal/traits/delete.py +1 -1
  66. pywargame/vassal/traits/deselect.py +1 -1
  67. pywargame/vassal/traits/dynamicproperty.py +1 -1
  68. pywargame/vassal/traits/globalcommand.py +1 -1
  69. pywargame/vassal/traits/globalhotkey.py +1 -1
  70. pywargame/vassal/traits/globalproperty.py +1 -1
  71. pywargame/vassal/traits/hide.py +1 -1
  72. pywargame/vassal/traits/label.py +1 -1
  73. pywargame/vassal/traits/layer.py +1 -1
  74. pywargame/vassal/traits/mark.py +1 -1
  75. pywargame/vassal/traits/mask.py +1 -1
  76. pywargame/vassal/traits/mat.py +4 -1
  77. pywargame/vassal/traits/moved.py +1 -1
  78. pywargame/vassal/traits/movefixed.py +1 -1
  79. pywargame/vassal/traits/nonrect.py +1 -1
  80. pywargame/vassal/traits/nostack.py +1 -1
  81. pywargame/vassal/traits/place.py +1 -1
  82. pywargame/vassal/traits/prototype.py +1 -1
  83. pywargame/vassal/traits/report.py +1 -1
  84. pywargame/vassal/traits/restrictaccess.py +1 -1
  85. pywargame/vassal/traits/restrictcommand.py +1 -1
  86. pywargame/vassal/traits/{return.py → retrn.py} +1 -1
  87. pywargame/vassal/traits/rotate.py +1 -1
  88. pywargame/vassal/traits/sendto.py +1 -1
  89. pywargame/vassal/traits/sheet.py +1 -1
  90. pywargame/vassal/traits/skel.py +1 -1
  91. pywargame/vassal/traits/stack.py +1 -1
  92. pywargame/vassal/traits/submenu.py +1 -1
  93. pywargame/vassal/traits/trail.py +1 -1
  94. pywargame/vassal/traits/trigger.py +1 -1
  95. pywargame/vassal/turn.py +1 -1
  96. pywargame/vassal/upgrade.py +1 -1
  97. pywargame/vassal/vmod.py +46 -2
  98. pywargame/vassal/widget.py +1 -1
  99. pywargame/vassal/withtraits.py +1 -1
  100. pywargame/vassal/zone.py +1 -1
  101. pywargame/zuntzu/__init__.py +9 -0
  102. pywargame/zuntzu/countersheet.py +3 -3
  103. pywargame/zuntzu/dicehand.py +2 -2
  104. pywargame/zuntzu/exporter.py +10 -10
  105. pywargame/zuntzu/gamebox.py +7 -7
  106. pywargame/zuntzu/map.py +2 -2
  107. pywargame/zuntzu/scenario.py +2 -2
  108. pywargame/zuntzu/ztexp.py +10 -8
  109. {pywargame-0.3.1.dist-info → pywargame-0.4.2.dist-info}/METADATA +51 -31
  110. pywargame-0.4.2.dist-info/RECORD +138 -0
  111. pywargame-0.4.2.dist-info/entry_points.txt +11 -0
  112. pywargame/cyberboard.py +0 -2728
  113. pywargame/gbx0pwd.py +0 -2776
  114. pywargame/gbxextract.py +0 -2795
  115. pywargame/gsnexport.py +0 -16499
  116. pywargame/gsnextract.py +0 -2790
  117. pywargame/vassal/patchcollect.py +0 -28
  118. pywargame/vassal/skel.py +0 -380
  119. pywargame/vassal.py +0 -12500
  120. pywargame/vmodpatch.py +0 -12548
  121. pywargame/vsavdump.py +0 -12533
  122. pywargame/vslmerge.py +0 -13015
  123. pywargame/wgexport.py +0 -16689
  124. pywargame/ztexport.py +0 -14351
  125. pywargame-0.3.1.dist-info/RECORD +0 -150
  126. /pywargame/vassal/{dumpcollect.py → collectdump.py} +0 -0
  127. /pywargame/vassal/{mrgcollect.py → collectmrg.py} +0 -0
  128. /pywargame/vassal/{xml.py → xmlns.py} +0 -0
  129. {pywargame-0.3.1.dist-info → pywargame-0.4.2.dist-info}/WHEEL +0 -0
  130. {pywargame-0.3.1.dist-info → pywargame-0.4.2.dist-info}/licenses/LICENSE +0 -0
  131. {pywargame-0.3.1.dist-info → pywargame-0.4.2.dist-info}/top_level.txt +0 -0
@@ -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 *
@@ -1059,17 +1059,34 @@ class MultiActionButton(GameElement):
1059
1059
  disabledIcon = '', # image when disabled
1060
1060
  menuItems = []): # Button texts
1061
1061
  '''
1062
- <VASSAL.build.module.MultiActionButton
1063
- canDisable="false"
1064
- description="Menu"
1065
- disabledIcon="" hideWhenDisabled="false"
1066
- hotkey="67,130"
1067
- icon="C.png"
1068
- menuItems="Attacked,Defended"
1069
- propertyGate=""
1070
- text=""
1071
- tooltip="Clear combat status flags."
1072
- />
1062
+ A button that executes other buttons (by `buttonText` name)
1063
+
1064
+ Parameters
1065
+ ----------
1066
+ game : pywargame.vassal.Game
1067
+ The game parent
1068
+ node : xml.dom.minidom.Node
1069
+ Possible node
1070
+ description : str
1071
+ Description (comment)
1072
+ text : str
1073
+ Text on button
1074
+ tooltip : str
1075
+ Button tool-tip
1076
+ icon : str
1077
+ Icon on button
1078
+ hotkey : str
1079
+ Hotkey or named command to execute button
1080
+ canDisable : bool
1081
+ If this can be disabled
1082
+ propertyGate : str
1083
+ When property (not expression) is `true`, then disable
1084
+ this button
1085
+ disabledIcon : str
1086
+ Icon to use when disabled
1087
+ menuItems : list of str
1088
+ `buttonText` of other buttons to execute
1089
+ (note, not named commands or hotkeys).
1073
1090
  '''
1074
1091
  super().__init__(game,
1075
1092
  self.TAG,
@@ -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,12 +1,11 @@
1
1
  #!/usr/bin/env python
2
2
  ## BEGIN_IMPORTS
3
- from vassal import Merger
4
- from common import Verbose
3
+ from pywargame.vassal import Merger
4
+ from pywargame.common import Verbose
5
5
  ## END_IMPORTS
6
6
 
7
-
8
7
  # ====================================================================
9
- if __name__ == '__main__':
8
+ def mergeMain():
10
9
  from argparse import ArgumentParser, FileType
11
10
 
12
11
  ap = ArgumentParser(description='Merge two modules or extensions')
@@ -49,7 +48,11 @@ if __name__ == '__main__':
49
48
  op.unlink(missing_ok=True)
50
49
 
51
50
  raise
52
-
51
+
52
+
53
+ # ====================================================================
54
+ if __name__ == '__main__':
55
+ mergeMain()
53
56
 
54
57
 
55
58
  #
@@ -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 . xmlns 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 pywargame.vassal import VMod
6
+ from pywargame.common import Verbose
7
7
  ## END_IMPORT
8
8
 
9
9
  # ====================================================================
@@ -18,7 +18,7 @@ def patchIt(args):
18
18
  VMod.patch(vmodname, patchname, args.verbose)
19
19
 
20
20
  # ====================================================================
21
- if __name__ == '__main__':
21
+ def patchMain():
22
22
  from argparse import ArgumentParser, FileType
23
23
 
24
24
  ap = ArgumentParser(description='Patch a module with a Python script')
@@ -35,10 +35,13 @@ if __name__ == '__main__':
35
35
  action='store_true')
36
36
 
37
37
  args = ap.parse_args()
38
-
39
38
 
40
39
  patchIt(args)
41
-
40
+
41
+ # ====================================================================
42
+ if __name__ == '__main__':
43
+ patchMain()
44
+
42
45
  #
43
46
  # EOF
44
47
  #
@@ -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/trait.py CHANGED
@@ -6,7 +6,8 @@ class Trait:
6
6
 
7
7
  Unlike the Element classes, this actually holds state that
8
8
  isn't reflected elsewhere in the DOM. This means that the
9
- data here is local to the object. So when we do
9
+ data here is local to the object. So when we do::
10
+
10
11
 
11
12
  piece = foo.getPieceSlots()[0]
12
13
  traits = p.getTraits()
@@ -14,23 +15,25 @@ class Trait:
14
15
  if trait.ID == 'piece':
15
16
  trait["gpid"] = newPid
16
17
  trait["lpid"] = newPid
17
-
18
+
18
19
  we do not actually change anything in the DOM. To do that, we
19
- must add back _all_ the traits as
20
-
20
+ must add back _all_ the traits as::
21
+
21
22
  piece.setTraits(traits)
22
23
 
23
- We can add traits to a piece, like
24
-
24
+ We can add traits to a piece, like::
25
+
25
26
  piece.addTrait(MarkTrait('Hello','World'))
26
-
27
+
27
28
  But it is not particularly efficient. Better to do
28
- (continuing from above)
29
-
29
+ (continuing from above)::
30
+
31
+
30
32
  traits.append(MarkTrait('Hello','World;)
31
33
  piece.setTraits(traits)
34
+
32
35
 
33
- .. include:: ../../vassal/traits/README.md
36
+ .. include:: traits/README.md
34
37
  :parser: myst_parser.sphinx_
35
38
 
36
39
  '''
@@ -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
@@ -40,8 +40,10 @@ class AreaTrait(Trait):
40
40
  onKey = onKey,
41
41
  offMenuText = offMenuText,
42
42
  offKey = offKey,
43
- globallyVisible = globallyVisible
44
- )
43
+ globallyVisible = globallyVisible)
44
+ '''Create an area effect trait
45
+
46
+ '''
45
47
  self.setState(active = alwaysActive or not globallyVisible)
46
48
 
47
49
  Trait.known_traits.append(AreaTrait)
@@ -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
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -14,6 +14,9 @@ class CargoTrait(Trait):
14
14
  detectionDistanceY = 0,
15
15
  attachKey = '',
16
16
  detachKey = ''):
17
+ '''Create cargo trait
18
+
19
+ '''
17
20
  self.setType(description = description,
18
21
  maintainRelativeFacing = maintainRelativeFacing,
19
22
  detectionDistanceX = detectionDistanceX,
@@ -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
  ## END_IMPORT
5
5
 
@@ -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 *
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 .. trait import Trait
4
4
  from .. base import *
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 .. trait import Trait
4
4
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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 . dynamicproperty import ChangePropertyTrait
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 .. trait import Trait
4
4
  from .. base import *
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 .. trait import Trait
4
4
  ## END_IMPORT
5
5
 
@@ -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 *
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 .. trait import Trait
4
4
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -10,6 +10,9 @@ class MatTrait(Trait):
10
10
  def __init__(self,
11
11
  name = 'Mat',
12
12
  description = ''):
13
+ '''Create mat trait
14
+
15
+ '''
13
16
  self.setType(name = name,
14
17
  description = description)
15
18
  self.setState(content='0')
@@ -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 *
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 .. trait import Trait
4
4
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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 *
5
5
  # from .. widget import *
@@ -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
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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 *
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 .. trait import Trait
4
4
  from .. base import *
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 .. trait import Trait
4
4
  from .. base import *
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 .. trait import Trait
4
4
  from .. base import *
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 .. trait import Trait
4
4
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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
  ## END_IMPORT
5
5
 
@@ -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 *
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 .. trait import Trait
4
4
  from .. base import *
5
5
  ## END_IMPORT
pywargame/vassal/turn.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
@@ -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 . command import *