Merge branch 'master' of github.com:bpython/bpython

sebastinas · sebastinas · commit 951acaccd57a · 2015-01-06T20:36:40.000+01:00
Conflicts:
	.travis.yml
diff --git a/bpython/test/test_crashers.py b/bpython/test/test_crashers.py
@@ -5,13 +5,11 @@
 import sys
 import termios
 import textwrap
-import unittest
 
 try:
-    from unittest import skip
+    import unittest2 as unittest
 except ImportError:
-    def skip(f):
-        return lambda self: None
+    import unittest
 
 try:
     from twisted.internet import reactor
@@ -103,14 +101,13 @@ def spam(a, (b, c)):
         return self.run_bpython(input).addCallback(self.check_no_traceback)
 
     def check_no_traceback(self, data):
-        tb = data[data.find("Traceback"):]
-        self.assertTrue("Traceback" not in data, tb)
+        self.assertNotIn("Traceback", data)
 
 if reactor is not None:
     class CursesCrashersTest(TrialTestCase, CrashersTest):
         backend = "cli"
 
-    @skip("take 6 seconds, and Simon says we can skip them")
+    @unittest.skip("take 6 seconds, and Simon says we can skip them")
     class UrwidCrashersTest(TrialTestCase, CrashersTest):
         backend = "urwid"
 
diff --git a/bpython/test/test_manual_readline.py b/bpython/test/test_manual_readline.py
@@ -1,5 +1,10 @@
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 from bpython.curtsiesfrontend.manual_readline import *
-import unittest
+
 
 class TestManualReadline(unittest.TestCase):
     def setUp(self):
@@ -222,7 +227,7 @@ def setUp(self):
     def test_seq(self):
         f = lambda cursor_offset, line: ('hi', 2)
         self.edits.add('a', f)
-        self.assertTrue('a' in self.edits)
+        self.assertIn('a', self.edits)
         self.assertEqual(self.edits['a'], f)
         self.assertEqual(self.edits.call('a', cursor_offset=3, line='hello'),
                          ('hi', 2))
@@ -245,12 +250,12 @@ def test_config(self):
         f = lambda cursor_offset, line: ('hi', 2)
         g = lambda cursor_offset, line: ('hey', 3)
         self.edits.add_config_attr('att', f)
-        self.assertFalse('att' in self.edits)
+        self.assertNotIn('att', self.edits)
         class config: att = 'c'
         key_dispatch = {'c': 'c'}
         configured_edits = self.edits.mapping_with_config(config, key_dispatch)
         self.assertTrue(configured_edits.__contains__, 'c')
-        self.assertFalse('c' in self.edits)
+        self.assertNotIn('c', self.edits)
         self.assertRaises(NotImplementedError,
                           configured_edits.add_config_attr, 'att2', g)
         self.assertRaises(NotImplementedError,
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -3,15 +3,13 @@
 import os
 import socket
 import sys
-import unittest
 
 from mock import Mock, MagicMock
 
 try:
-    from unittest import skip
+    import unittest2 as unittest
 except ImportError:
-    def skip(f):
-        return lambda self: None
+    import unittest
 
 py3 = (sys.version_info[0] == 3)
 
@@ -101,7 +99,7 @@ def test_append(self):
 
         self.assertEqual(self.history.back(), 'print "foo\n"')
 
-    @skip("I don't understand this test")
+    @unittest.skip("I don't understand this test")
     def test_enter(self):
         self.history.enter('#lastnumber!')
 
@@ -278,7 +276,7 @@ def assert_get_source_error_for_current_function(self, func, msg):
     def test_current_function(self):
         self.set_input_line('INPUTLINE')
         self.repl.current_func = collections.MutableSet.add
-        self.assertTrue("Add an element." in self.repl.get_source_of_current_name())
+        self.assertIn("Add an element.", self.repl.get_source_of_current_name())
 
         self.assert_get_source_error_for_current_function(
                 collections.defaultdict.copy, "No source code found for INPUTLINE")
@@ -295,7 +293,7 @@ def test_current_function(self):
     def test_current_line(self):
         self.repl.interp.locals['a'] = socket.socket
         self.set_input_line('a')
-        self.assertTrue('dup(self)' in self.repl.get_source_of_current_name())
+        self.assertIn('dup(self)', self.repl.get_source_of_current_name())
 
 #TODO add tests for various failures without using current function
 
@@ -334,7 +332,7 @@ def test_simple_global_complete(self):
         self.assertEqual(self.repl.matches_iter.matches,
             ['def', 'del', 'delattr(', 'dict(', 'dir(', 'divmod('])
 
-    @skip("disabled while non-simple completion is disabled")
+    @unittest.skip("disabled while non-simple completion is disabled")
     def test_substring_global_complete(self):
         self.repl = FakeRepl({'autocomplete_mode': autocomplete.SUBSTRING})
         self.setInputLine("time")
@@ -344,7 +342,7 @@ def test_substring_global_complete(self):
         self.assertEqual(self.repl.completer.matches,
             ['RuntimeError(', 'RuntimeWarning('])
 
-    @skip("disabled while non-simple completion is disabled")
+    @unittest.skip("disabled while non-simple completion is disabled")
     def test_fuzzy_global_complete(self):
         self.repl = FakeRepl({'autocomplete_mode': autocomplete.FUZZY})
         self.setInputLine("doc")
@@ -368,7 +366,7 @@ def test_simple_attribute_complete(self):
         self.assertEqual(self.repl.matches_iter.matches,
             ['Foo.bar'])
 
-    @skip("disabled while non-simple completion is disabled")
+    @unittest.skip("disabled while non-simple completion is disabled")
     def test_substring_attribute_complete(self):
         self.repl = FakeRepl({'autocomplete_mode': autocomplete.SUBSTRING})
         self.setInputLine("Foo.az")
@@ -382,7 +380,7 @@ def test_substring_attribute_complete(self):
         self.assertEqual(self.repl.completer.matches,
             ['Foo.baz'])
 
-    @skip("disabled while non-simple completion is disabled")
+    @unittest.skip("disabled while non-simple completion is disabled")
     def test_fuzzy_attribute_complete(self):
         self.repl = FakeRepl({'autocomplete_mode': autocomplete.FUZZY})
         self.setInputLine("Foo.br")
@@ -412,7 +410,7 @@ def test_file_should_not_appear_in_complete(self):
         self.setInputLine("_")
         self.assertTrue(self.repl.complete())
         self.assertTrue(hasattr(self.repl.matches_iter,'matches'))
-        self.assertTrue('__file__' not in self.repl.matches_iter.matches)
+        self.assertNotIn('__file__', self.repl.matches_iter.matches)
 
 
 class TestCliRepl(unittest.TestCase):
@@ -465,7 +463,7 @@ def test_simple_tab_complete(self):
         self.repl.complete.assert_called_with(tab=True)
         self.assertEqual(self.repl.s, "foobar")
 
-    @skip("disabled while non-simple completion is disabled")
+    @unittest.skip("disabled while non-simple completion is disabled")
     def test_substring_tab_complete(self):
         self.repl.s = "bar"
         self.repl.config.autocomplete_mode = autocomplete.FUZZY
@@ -474,7 +472,7 @@ def test_substring_tab_complete(self):
         self.repl.tab()
         self.assertEqual(self.repl.s, "foofoobar")
 
-    @skip("disabled while non-simple completion is disabled")
+    @unittest.skip("disabled while non-simple completion is disabled")
     def test_fuzzy_tab_complete(self):
         self.repl.s = "br"
         self.repl.config.autocomplete_mode = autocomplete.FUZZY
@@ -509,7 +507,7 @@ def test_back_parameter(self):
         self.assertTrue(self.repl.s, "previtem")
 
     # Attribute Tests
-    @skip("disabled while non-simple completion is disabled")
+    @unittest.skip("disabled while non-simple completion is disabled")
     def test_fuzzy_attribute_tab_complete(self):
         """Test fuzzy attribute with no text"""
         self.repl.s = "Foo."
@@ -518,7 +516,7 @@ def test_fuzzy_attribute_tab_complete(self):
         self.repl.tab()
         self.assertEqual(self.repl.s, "Foo.foobar")
 
-    @skip("disabled while non-simple completion is disabled")
+    @unittest.skip("disabled while non-simple completion is disabled")
     def test_fuzzy_attribute_tab_complete2(self):
         """Test fuzzy attribute with some text"""
         self.repl.s = "Foo.br"
@@ -538,14 +536,14 @@ def test_simple_expand(self):
         self.repl.tab()
         self.assertEqual(self.repl.s, "foo")
 
-    @skip("disabled while non-simple completion is disabled")
+    @unittest.skip("disabled while non-simple completion is disabled")
     def test_substring_expand_forward(self):
         self.repl.config.autocomplete_mode = autocomplete.SUBSTRING
         self.repl.s = "ba"
         self.repl.tab()
         self.assertEqual(self.repl.s, "bar")
 
-    @skip("disabled while non-simple completion is disabled")
+    @unittest.skip("disabled while non-simple completion is disabled")
     def test_fuzzy_expand(self):
         pass
 
diff --git a/setup.py b/setup.py
@@ -135,6 +135,11 @@ def initialize_options(self):
 ]
 data_files.extend(man_pages)
 
+install_requires = [
+    'pygments',
+    'requests'
+]
+
 extras_require = {
     'urwid' : ['urwid']
 }
@@ -161,6 +166,14 @@ def initialize_options(self):
     if not using_setuptools:
         scripts.append('data/bpython-curtsies')
 
+if sys.version_info[0] == 2 and sys.platform == "darwin":
+    # need PyOpenSSL for SNI support (only 2.X and on Darwin)
+    # list of packages taken from
+    # https://github.com/kennethreitz/requests/blob/master/requests/packages/urllib3/contrib/pyopenssl.py
+    install_requires.append('PyOpenSSL')
+    install_requires.append('ndg-httpsclient')
+    install_requires.append('pyasn1')
+
 # translations
 mo_files = list()
 for language in os.listdir(translations_dir):
@@ -178,12 +191,9 @@ def initialize_options(self):
     url = "http://www.bpython-interpreter.org/",
     long_description = """bpython is a fancy interface to the Python
     interpreter for Unix-like operating systems.""",
-    install_requires = [
-        'pygments',
-        'requests'
-    ],
+    install_requires = install_requires,
     extras_require = extras_require,
-    tests_require = ['mock'],
+    tests_require = ['mock', 'unittest2'],
     packages = packages,
     data_files = data_files,
     package_data = {
