Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7530: gen.test.constfunc_test broken in python3

Browse Source 
Use the `in' operator rather than has_key() method to check for
environment variables in os.environ. Works on both python2 and python3.
This commit is contained in:
Vassilii Khachaturov 2014-03-18 15:48:04 +02:00
parent a030c20210
commit b4d2e60198
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps/gen/test/constfunc_test.py
View File

@ -19,8 +19,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# $Id$
""" Unittest for constfunc.py """ """ Unittest for constfunc.py """
from __future__ import print_function from __future__ import print_function
@ -33,13 +31,13 @@ from os import environ as env
class Test_has_display(unittest.TestCase): class Test_has_display(unittest.TestCase):
def setUp(self): def setUp(self):
self.has = constfunc.has_display() self.has = constfunc.has_display()
self.display_nonempty = env.has_key('DISPLAY') and bool(env['DISPLAY']) self.display_nonempty = ('DISPLAY' in env) and bool(env['DISPLAY'])
@unittest.skipUnless(constfunc.lin(), "Written for Linux only...") @unittest.skipUnless(constfunc.lin(), "Written for Linux only...")
def test_consistent_with_DISPLAY_env(self): def test_consistent_with_DISPLAY_env(self):
assert self.has == self.display_nonempty, \ assert self.has == self.display_nonempty, \
"has_display(): {}, $DISPLAY: {}".format( "has_display(): {}, $DISPLAY: {}".format(
self.has, env['DISPLAY'] if env.has_key('DISPLAY') \ self.has, env['DISPLAY'] if ('DISPLAY' in env) \
else "(unset)") else "(unset)")
if __name__ == "__main__": if __name__ == "__main__":