8000 Hard require setuptools and clean up test suite somewhat. · python-rope/ropemode@298e315 · GitHub
[go: up one dir, main page]
Skip to content

Commit 298e315

Browse files
mceplmcepl
committed
Hard require setuptools and clean up test suite somewhat.
1 parent e056120 commit 298e315

File tree

2 files changed

+25
-28
lines changed
  • setup.py

    • 2 files changed

    +25
    -28
    lines changed

    ‎ropemodetest.py

    Lines changed: 22 additions & 22 deletions
    Original file line numberDiff line numberDiff line change
    @@ -13,58 +13,58 @@ def tearDown(self):
    1313

    1414
    def test_trivial_case(self):
    1515
    action, confs = dialog.show_dialog(_MockAskConfig(['done']), ['done'])
    16-
    self.assertEquals('done', action)
    17-
    self.assertEquals({}, confs)
    16+
    self.assertEqual('done', action)
    17+
    self.assertEqual({}, confs)
    1818

    1919
    def test_asking_normal_configs(self):
    2020
    confs = {'name': dialog.Data()}
    2121
    minibuffer = _MockAskConfig(['value', 'done'])
    2222
    action, result = dialog.show_dialog(minibuffer,
    2323
    ['done', 'cancel'], confs)
    24-
    self.assertEquals({'name': 'value'}, result)
    25-
    self.assertEquals('done', action)
    24+
    self.assertEqual({'name': 'value'}, result)
    25+
    self.assertEqual('done', action)
    2626

    2727
    def test_optional_confs(self):
    2828
    optionals = {'name': dialog.Data()}
    2929
    minibuffer = _MockAskConfig(['done'])
    3030
    action, result = dialog.show_dialog(minibuffer, ['done', 'cancel'],
    3131
    optionals=optionals)
    32-
    self.assertEquals(None, result.get('name', None))
    33-
    self.assertEquals('done', action)
    32+
    self.assertEqual(None, result.get('name', None))
    33+
    self.assertEqual('done', action)
    3434

    3535
    def test_optional_confs2(self):
    3636
    optionals = {'name': dialog.Data()}
    3737
    minibuffer = _MockAskConfig(['name', 'value', 'done'])
    3838
    action, result = dialog.show_dialog(minibuffer, ['done', 'cancel'],
    3939
    optionals=optionals)
    40-
    self.assertEquals({'name': 'value'}, result)
    41-
    self.assertEquals('done', action)
    40+
    self.assertEqual({'name': 'value'}, result)
    41+
    self.assertEqual('done', action)
    4242

    4343
    def test_trivial_batchset(self):
    4444
    optionals = {'name': dialog.Data()}
    4545
    minibuffer = _MockAskConfig(['batchset', 'name value', 'done'])
    4646
    action, result = dialog.show_dialog(minibuffer, ['done', 'cancel'],
    4747
    optionals=optionals)
    48-
    self.assertEquals({'name': 'value'}, result)
    49-
    self.assertEquals('done', action)
    48+
    self.assertEqual({'name': 'value'}, result)
    49+
    self.assertEqual('done', action)
    5050

    5151
    def test_batchset_multiple_sets(self):
    5252
    optionals = {'name1': dialog.Data(), 'name2': dialog.Data()}
    5353
    minibuffer = _MockAskConfig(['batchset',
    5454
    'name1 value1\nname2 value2', 'done'])
    5555
    action, result = dialog.show_dialog(minibuffer, ['done', 'cancel'],
    5656
    optionals=optionals)
    57-
    self.assertEquals({'name1': 'value1', 'name2': 'value2'}, result)
    58-
    self.assertEquals('done', action)
    57+
    self.assertEqual({'name1': 'value1', 'name2': 'value2'}, result)
    58+
    self.assertEqual('done', action)
    5959

    6060
    def test_multiline_sets(self):
    6161
    optionals = {'name': dialog.Data()}
    6262
    minibuffer = _MockAskConfig(
    6363
    ['batchset', 'name\n line1\n line2\n', 'done'])
    6464
    action, result = dialog.show_dialog(minibuffer, ['done', 'cancel'],
    6565
    optionals=optionals)
    66-
    self.assertEquals({'name': 'line1\n line2\n'}, result)
    67-
    self.assertEquals('done', action)
    66+
    self.assertEqual({'name': 'line1\n line2\n'}, result)
    67+
    self.assertEqual('done', action)
    6868

    6969
    def test_complex_batchset(self):
    7070
    optionals = {'name1': dialog.Data(), 'name2': dialog.Data(),
    @@ -74,37 +74,37 @@ def test_complex_batchset(self):
    7474
    'line2\n\nname2 value2\n', 'done'])
    7575
    action, result = dialog.show_dialog(minibuffer, ['done', 'cancel'],
    7676
    optionals=optionals)
    77-
    self.assertEquals(
    77+
    self.assertEqual(
    7878
    {'name1': 'line1\n line2\n', 'name2': 'value2',
    7979
    'name3': 'value3\n'}, result)
    80-
    self.assertEquals('done', action)
    80+
    self.assertEqual('done', action)
    8181

    8282
    def test_skipping_blanks(self):
    8383
    optionals = {'name1': dialog.Data(), 'name2': dialog.Data()}
    8484
    minibuffer = _MockAskConfig(
    8585
    ['batchset', '\nname1\n value1\n\nname2 value2\n\n', 'done'])
    8686
    action, result = dialog.show_dialog(minibuffer, ['done', 'cancel'],
    8787
    optionals=optionals)
    88-
    self.assertEquals({'name1': 'value1\n', 'name2': 'value2'}, result)
    89-
    self.assertEquals('done', action)
    88+
    self.assertEqual({'name1': 'value1\n', 'name2': 'value2'}, result)
    89+
    self.assertEqual('done', action)
    9090

    9191
    def test_skip_initial_asking(self):
    9292
    confs = {'name': dialog.Data()}
    9393
    minibuffer = _MockAskConfig(
    9494
    ['name', 'value', 'done'])
    9595
    action, result = dialog.show_dialog(minibuffer, ['done', 'cancel'],
    9696
    confs=confs, initial_asking=False)
    97-
    self.assertEquals({'name': 'value'}, result)
    98-
    self.assertEquals('done', action)
    97+
    self.assertEqual({'name': 'value'}, result)
    98+
    self.assertEqual('done', action)
    9999

    100100
    def test_ignoring_trailing_colon_in_config_names(self):
    101101
    optionals = {'name1': dialog.Data()}
    102102
    minibuffer = _MockAskConfig(
    103103
    ['batchset', 'name1: value1\n', 'done'])
    104104
    action, result = dialog.show_dialog(minibuffer, ['done', 'cancel'],
    105105
    optionals=optionals)
    106-
    self.assertEquals({'name1': 'value1'}, result)
    107-
    self.assertEquals('done', action)
    106+
    self.assertEqual({'name1': 'value1'}, result)
    107+
    self.assertEqual('done', action)
    108108

    109109

    110110
    class _MockAskConfig(object):

    ‎setup.py

    Lines changed: 3 additions & 6 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,9 +1,5 @@
    11
    extra_kwargs = {}
    2-
    try:
    3-
    from setuptools import setup
    4-
    extra_kwargs['install_requires'] = ['rope >= 0.9.4']
    5-
    except ImportError:
    6-
    from distutils.core import setup
    2+
    from setuptools import setup
    73

    84
    import ropemode
    95

    @@ -29,7 +25,8 @@
    2925
    packages=['ropemode'],
    3026
    license='GNU GPL',
    3127
    classifiers=classifiers,
    28+
    test_suite='ropemodetest',
    3229
    requires=['rope (>= 0.9.4)'],
    33-
    **extra_kwargs
    30+
    install_requires='rope >= 0.9.4'
    3431
    )
    3532

    0 commit comments

    Comments
     (0)
    0