upstream merge

python/pyspark/context.py

@@ -24,7 +24,7 @@
 import tarfile
 import tempfile
 import uuid
-from threading import Lock
+from threading import RLock
 from tempfile import NamedTemporaryFile
 
 from pyspark import accumulators
@@ -114,7 +114,7 @@ def __init__(self, master=None, appName=None, sparkHome=None, pyFiles=None,
         SparkContext._ensure_initialized(self, gateway=gateway)
         try:
             self._do_init(master, appName, sparkHome, pyFiles, environment,
-                          batchSize, serializer, conf, jsc, profiler_cls, requirementsFile)
+                          batchSize, serializer, conf, jsc, profiler_cls)
         except:
             # If an error occurs, clean up in order to allow future SparkContext creation:
             self.stop()