Merge heads.

2 files changed, 10 insertions, 0 deletions

diff --git a/astroid/brain/brain_stdlib.py b/astroid/brain/brain_stdlib.py
index 51265d6..a03358f 100644
--- a/astroid/brain/brain_stdlib.py
+++ b/astroid/brain/brain_stdlib.py
@@ -412,6 +412,11 @@ def multiprocessing_managers_transform():
         Namespace = Namespace
         __enter__ = lambda self: self
         __exit__ = lambda *args: args
+        
+        def start(self, initializer=None, initargs=None):
+            pass
+        def shutdown(self):
+            pass
     '''))
 
 
diff --git a/astroid/tests/unittest_brain.py b/astroid/tests/unittest_brain.py
index cb35462..3520b49 100644
--- a/astroid/tests/unittest_brain.py
+++ b/astroid/tests/unittest_brain.py
@@ -343,6 +343,11 @@ class MultiprocessingBrainTest(unittest.TestCase):
         array = next(module['array'].infer())
         self.assertEqual(array.qname(), "array.array")
 
+        manager = next(module['manager'].infer())
+        # Verify that we have these attributes
+        self.assertTrue(manager.getattr('start'))
+        self.assertTrue(manager.getattr('shutdown'))
+
 
 @unittest.skipUnless(HAS_ENUM,
                      'The enum module was only added in Python 3.4. Support for '