Map input to raw_input for 2.7 compatability

change default https context to the more universal stdlib context
saltstack · Dec 31, 2015 · 71e8dfb · 71e8dfb
1 parent f64aae8
commit 71e8dfb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pepper/cli.py b/pepper/cli.py
@@ -17,6 +17,11 @@
     # Python 2
     import ConfigParser
 
+try:
+    input = raw_input
+except NameError:
+    pass
+
 import pepper
 
 try:

diff --git a/pepper/libpepper.py b/pepper/libpepper.py
@@ -8,11 +8,12 @@
 import json
 import logging
 import os
+import ssl
 try:
-    import ssl
-    ssl._create_default_https_context = ssl._create_unverified_context
+    ssl._create_default_https_context = ssl._create_stdlib_context
 except:
     pass
+
 try:
     from urllib.request import HTTPHandler, Request, urlopen, \
         install_opener, build_opener