Skip to content

Commit 64771c6

Browse files
author
mgotz
committed
bug fixes in log.py
update gitignore and added future to dependencies to import from builtins
1 parent f23b6d1 commit 64771c6

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#all python byte code
22
*.pyc
3+
34
#build and setup stuff
45
build
56
dist
6-
*.egg-info
7+
*.egg-info
8+
9+
#the log file from testing
10+
log.out

mg/pyguitools/Log.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
### import ui created with qtdesigner
2727
### create python file with:
2828
### pyuic5 Log.ui > ui_Log_qt5.py
29-
from ui_Log_qt5 import Ui_DockWidget
29+
from .ui_Log_qt5 import Ui_DockWidget
3030

3131
from PyQt5 import QtCore
3232

@@ -37,7 +37,7 @@
3737
### import ui created with qtdesigner
3838
### create python file with:
3939
### pyuic4 Log.ui > ui_Log_qt4.py
40-
from ui_Log_qt4 import Ui_DockWidget
40+
from .ui_Log_qt4 import Ui_DockWidget
4141

4242
from PyQt4 import QtCore
4343
except ImportError as e:
@@ -147,7 +147,7 @@ def __init__(self, fmt="%(levelno)s: %(asctime)s %(msg)s", datefmt=None,
147147

148148

149149
if not infoString:
150-
self.level_tranlsation["20: "] = ""
150+
self.level_translation["20: "] = ""
151151
# self.info_fmt = "%(asctime)s %(msg)s"
152152

153153
def format(self, record):

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def read(fname):
1212

1313
setup(
1414
name='mg_pyguitools',
15-
version='1.1.0',
15+
version='1.1.1',
1616

1717
packages=find_packages(), #automagically include all subfolders as packages
1818

@@ -23,5 +23,5 @@ def read(fname):
2323
author_email='[email protected]',
2424
url='https://github.com/mgotz/PyGUITools',
2525

26-
install_requires=['matplotlib','formlayout']
26+
install_requires=['matplotlib','formlayout','future']
2727
)

0 commit comments

Comments
 (0)