python 3 compatibility

remove __eq__ and __ne__ in Option
This commit is contained in:
gwen
2013-08-28 11:33:43 +02:00
committed by Emmanuel Garette
parent fc9aa7fad5
commit fbf05ba5e4
16 changed files with 161 additions and 173 deletions

View File

@ -2,7 +2,7 @@ import autopath
#from py.test import raises
from tiramisu.config import Config, mandatory_warnings
from tiramisu.option import StrOption, OptionDescription, UnicodeOption
from tiramisu.option import StrOption, UnicodeOption, OptionDescription
from tiramisu.error import PropertiesOptionError
@ -26,7 +26,7 @@ def test_mandatory_ro():
prop = []
try:
config.str1
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert 'mandatory' in prop
config.read_write()
@ -61,7 +61,7 @@ def test_mandatory_default():
prop = []
try:
config.str
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert 'mandatory' in prop
@ -76,7 +76,7 @@ def test_mandatory_none():
prop = []
try:
config.str1
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert 'mandatory' in prop
@ -90,7 +90,7 @@ def test_mandatory_empty():
prop = []
try:
config.str1
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert 'mandatory' in prop
@ -104,7 +104,7 @@ def test_mandatory_multi_none():
prop = []
try:
config.str3
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert 'mandatory' in prop
config.read_write()
@ -114,7 +114,7 @@ def test_mandatory_multi_none():
prop = []
try:
config.str3
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert 'mandatory' in prop
@ -128,7 +128,7 @@ def test_mandatory_multi_empty():
prop = []
try:
config.str3
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert 'mandatory' in prop
config.read_write()
@ -138,7 +138,7 @@ def test_mandatory_multi_empty():
prop = []
try:
config.str3
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert 'mandatory' in prop
@ -160,16 +160,16 @@ def test_mandatory_disabled():
prop = []
try:
config.str1
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert prop == ['mandatory']
setting[descr.str1].append('disabled')
prop = []
try:
config.str1
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert prop == ['disabled', 'mandatory']
assert set(prop) == set(['disabled', 'mandatory'])
def test_mandatory_unicode():
@ -180,7 +180,7 @@ def test_mandatory_unicode():
prop = []
try:
config.unicode2
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert prop == ['mandatory']
config.read_write()
@ -189,7 +189,7 @@ def test_mandatory_unicode():
prop = []
try:
config.unicode2
except PropertiesOptionError, err:
except PropertiesOptionError as err:
prop = err.proptype
assert prop == ['mandatory']
@ -202,7 +202,7 @@ def test_mandatory_warnings_ro():
proc = []
try:
config.str
except PropertiesOptionError, err:
except PropertiesOptionError as err:
proc = err.proptype
assert proc == ['mandatory']
assert list(mandatory_warnings(config)) == ['str', 'str1', 'unicode2', 'str3']