Merge pull request kubernetes#5271 from GoogleCloudPlatform/revert-52…

…59-salt_drones Revert "Fix need for yaml in GCE kube-up by importing PyYAML into third_...
duda · Mar 10, 2015 · 5e99abe · 5e99abe
2 parents aa4dbc0 + 7333d99
commit 5e99abe
Show file tree

Hide file tree

Showing 654 changed files with 0 additions and 44,650 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,3 @@ network_closure.sh
 /third_party/etcd*
 
 .tags*
-
-# Any compiled python
-*.pyc
diff --git a/cluster/gce/kube-env.py b/cluster/gce/kube-env.py
@@ -16,10 +16,6 @@
 
 import os
 import sys
-
-filedir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(
-    0, os.path.normpath(os.path.join(filedir, "../../third_party/PyYAML/lib")))
 import yaml
 
 def mutate_env(path, var, value):

diff --git a/third_party/PyYAML/CHANGES b/third_party/PyYAML/CHANGES
diff --git a/third_party/PyYAML/LICENSE b/third_party/PyYAML/LICENSE
diff --git a/third_party/PyYAML/PKG-INFO b/third_party/PyYAML/PKG-INFO
diff --git a/third_party/PyYAML/README b/third_party/PyYAML/README
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,3 @@ network_closure.sh @@
     /third_party/etcd*
     .tags*
-    # Any compiled python
-    *.pyc