Merge 3.5

diff --cc Lib/rlcompleter.py
Simple merge

diff --cc Lib/test/test_rlcompleter.py
index 208c0545c4405c580bb1adf1fa998fb6f457004a,853e77330aa0fe0f4cc7bd64fea516be1d7ead54..0dc1080ca32093cf0e82455ec81cebbed72a9566
--- 1/Lib/test/test_rlcompleter.py
--- 2/Lib/test/test_rlcompleter.py
+++ b/Lib/test/test_rlcompleter.py
@@@ -93,14 -78,7 +93,15 @@@ class TestRlcompleter(unittest.TestCase
          self.assertEqual(completer.complete('f.b', 0), 'f.bar')
          self.assertEqual(f.calls, 1)
  
 +    def test_uncreated_attr(self):
 +        # Attributes like properties and slots should be completed even when
 +        # they haven't been created on an instance
 +        class Foo:
 +            __slots__ = ("bar",)
 +        completer = rlcompleter.Completer(dict(f=Foo()))
 +        self.assertEqual(completer.complete('f.', 0), 'f.bar')
 +
+     @unittest.mock.patch('rlcompleter._readline_available', False)
      def test_complete(self):
          completer = rlcompleter.Completer()
          self.assertEqual(completer.complete('', 0), '\t')