Skip to content

Commit 0e2fe70

Browse files
Changes to make it work on Python 3 with wxPython 4.
1 parent e1affce commit 0e2fe70

File tree

10 files changed

+22
-17
lines changed

10 files changed

+22
-17
lines changed

InteractiveHtmlBom/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import wx
77
import wx.aui
88

9-
from generate_interactive_bom import GenerateInteractiveBomPlugin
9+
from .generate_interactive_bom import GenerateInteractiveBomPlugin
1010

1111

1212
def check_for_bom_button():

InteractiveHtmlBom/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from wx import FileConfig
77

8-
import dialog.settings_dialog
8+
from .dialog import settings_dialog
99

1010

1111
class Config:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from settings_dialog import SettingsDialog
1+
from .settings_dialog import SettingsDialog

InteractiveHtmlBom/dialog/settings_dialog.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import wx
66

7-
import dialog_base
7+
from . import dialog_base
88

99

1010
def pop_error(msg):
@@ -24,7 +24,12 @@ def __init__(self, extra_data_func, config_save_func):
2424
# hack for new wxFormBuilder generating code incompatible with old wxPython
2525
# noinspection PyMethodOverriding
2626
def SetSizeHints(self, sz1, sz2):
27-
self.SetSizeHintsSz(sz1, sz2)
27+
try:
28+
# wxPython 3
29+
self.SetSizeHintsSz(sz1, sz2)
30+
except TypeError:
31+
# wxPython 4
32+
super(SettingsDialog, self).SetSizeHints(sz1, sz2)
2833

2934
def set_extra_data_path(self, extra_data_file):
3035
self.panel.extra.netlistFilePicker.Path = extra_data_file

InteractiveHtmlBom/fontparser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from newstroke_font import NEWSTROKE_FONT
1+
from .newstroke_font import NEWSTROKE_FONT
22

33

44
class FontParser:

InteractiveHtmlBom/generate_interactive_bom.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import pcbnew
1010
import wx
1111

12-
import dialog
13-
import units
14-
from config import Config
15-
from fontparser import FontParser
16-
from schematic_data import parse_schematic_data, find_latest_schematic_data
12+
from . import dialog
13+
from . import units
14+
from .config import Config
15+
from .fontparser import FontParser
16+
from .schematic_data import parse_schematic_data, find_latest_schematic_data
1717

1818

1919
def setup_logger():

InteractiveHtmlBom/schematic_data/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22

3-
from xmlparser import XmlParser
4-
from netlistparser import NetlistParser
3+
from .xmlparser import XmlParser
4+
from .netlistparser import NetlistParser
55

66
PARSERS = {
77
'.xml': XmlParser,

InteractiveHtmlBom/schematic_data/netlistparser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from parser_base import ParserBase
2-
from sexpressions import parse_sexpression
1+
from .parser_base import ParserBase
2+
from .sexpressions import parse_sexpression
33

44

55
class NetlistParser(ParserBase):

InteractiveHtmlBom/schematic_data/xmlparser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from xml.dom import minidom
22

3-
from parser_base import ParserBase
3+
from .parser_base import ParserBase
44

55

66
class XmlParser(ParserBase):

__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import InteractiveHtmlBom
1+
from . import InteractiveHtmlBom

0 commit comments

Comments
 (0)