Update runtime to 1.9.22

python_vm_runtime/VERSION

@@ -1,5 +1,5 @@
-release: "1.9.15"
-timestamp: 1413915397
+release: "1.9.22"
+timestamp: 1431461849
 api_versions: ['1']
 supported_api_versions:
   python:

python_vm_runtime/api_server.py

@@ -23,6 +23,7 @@
 
 import os
 import sys
+import time
 
 sys_path = sys.path
 try:
@@ -34,6 +35,11 @@
   sys.path = sys_path
 
 wrapper_util.reject_old_python_versions((2, 5))
+if sys.version_info < (2, 6):
+  sys.stderr.write(
+      'WARNING: In an upcoming release the SDK will no longer support Python'
+      ' 2.5. Users should upgrade to Python 2.6 or higher.\n')
+  time.sleep(1)
 
 
 

python_vm_runtime/appcfg.py

@@ -23,6 +23,7 @@
 
 import os
 import sys
+import time
 
 sys_path = sys.path
 try:
@@ -34,6 +35,11 @@
   sys.path = sys_path
 
 wrapper_util.reject_old_python_versions((2, 5))
+if sys.version_info < (2, 6):
+  sys.stderr.write(
+      'WARNING: In an upcoming release the SDK will no longer support Python'
+      ' 2.5. Users should upgrade to Python 2.6 or higher.\n')
+  time.sleep(1)
 
 
 

python_vm_runtime/backends_conversion.py

@@ -23,6 +23,7 @@
 
 import os
 import sys
+import time
 
 sys_path = sys.path
 try:
@@ -34,6 +35,11 @@
   sys.path = sys_path
 
 wrapper_util.reject_old_python_versions((2, 5))
+if sys.version_info < (2, 6):
+  sys.stderr.write(
+      'WARNING: In an upcoming release the SDK will no longer support Python'
+      ' 2.5. Users should upgrade to Python 2.6 or higher.\n')
+  time.sleep(1)
 
 
 

python_vm_runtime/bulkload_client.py

@@ -23,6 +23,7 @@
 
 import os
 import sys
+import time
 
 sys_path = sys.path
 try:
@@ -34,6 +35,11 @@
   sys.path = sys_path
 
 wrapper_util.reject_old_python_versions((2, 5))
+if sys.version_info < (2, 6):
+  sys.stderr.write(
+      'WARNING: In an upcoming release the SDK will no longer support Python'
+      ' 2.5. Users should upgrade to Python 2.6 or higher.\n')
+  time.sleep(1)
 
 
 

python_vm_runtime/bulkloader.py

@@ -23,6 +23,7 @@
 
 import os
 import sys
+import time
 
 sys_path = sys.path
 try:
@@ -34,6 +35,11 @@
   sys.path = sys_path
 
 wrapper_util.reject_old_python_versions((2, 5))
+if sys.version_info < (2, 6):
+  sys.stderr.write(
+      'WARNING: In an upcoming release the SDK will no longer support Python'
+      ' 2.5. Users should upgrade to Python 2.6 or higher.\n')
+  time.sleep(1)
 
 
 

python_vm_runtime/demos/php/guestbook/app.yaml

@@ -1,6 +1,6 @@
 application: guestbook
 version: 1
-runtime: php
+runtime: php55
 api_version: 1
 
 handlers:
@@ -15,4 +15,4 @@ env_variables:
  PRODUCTION_CLOUD_SQL_INSTANCE: '/cloudsql/guestbook:my-cloudsql-instance'
  PRODUCTION_DB_USERNAME: ''
  PRODUCTION_DB_PASSWORD: ''
- PRODUCTION_DB_NAME: 'guestbook'
+ PRODUCTION_DB_NAME: 'guestbook'

python_vm_runtime/demos/php/minishell/app.yaml

@@ -1,6 +1,6 @@
 application: shell-php
 version: 1
-runtime: php
+runtime: php55
 api_version: 1
 
 handlers:

python_vm_runtime/demos/php/mod_rewrite/app.yaml

@@ -1,6 +1,6 @@
-application: mod_rewrite_simulator
+application: mod-rewrite-simulator
 version: 1
-runtime: php
+runtime: php55
 api_version: 1
 
 handlers:

python_vm_runtime/demos/php/sendpage/app.yaml

@@ -1,6 +1,6 @@
 application: sendpage
 version: 1
-runtime: php
+runtime: php55
 api_version: 1
 
 handlers:
@@ -10,4 +10,4 @@ handlers:
 
 - url: /.*
   script: index.php
-  login: admin
+  login: admin

python_vm_runtime/download_appstats.py

@@ -23,6 +23,7 @@
 
 import os
 import sys
+import time
 
 sys_path = sys.path
 try:
@@ -34,6 +35,11 @@
   sys.path = sys_path
 
 wrapper_util.reject_old_python_versions((2, 5))
+if sys.version_info < (2, 6):
+  sys.stderr.write(
+      'WARNING: In an upcoming release the SDK will no longer support Python'
+      ' 2.5. Users should upgrade to Python 2.6 or higher.\n')
+  time.sleep(1)
 
 
 

python_vm_runtime/endpointscfg.py

@@ -23,6 +23,7 @@
 
 import os
 import sys
+import time
 
 sys_path = sys.path
 try:
@@ -34,6 +35,11 @@
   sys.path = sys_path
 
 wrapper_util.reject_old_python_versions((2, 5))
+if sys.version_info < (2, 6):
+  sys.stderr.write(
+      'WARNING: In an upcoming release the SDK will no longer support Python'
+      ' 2.5. Users should upgrade to Python 2.6 or higher.\n')
+  time.sleep(1)
 
 
 

python_vm_runtime/gen_protorpc.py

@@ -23,6 +23,7 @@
 
 import os
 import sys
+import time
 
 sys_path = sys.path
 try:
@@ -34,6 +35,11 @@
   sys.path = sys_path
 
 wrapper_util.reject_old_python_versions((2, 5))
+if sys.version_info < (2, 6):
+  sys.stderr.write(
+      'WARNING: In an upcoming release the SDK will no longer support Python'
+      ' 2.5. Users should upgrade to Python 2.6 or higher.\n')
+  time.sleep(1)
 
 
 

python_vm_runtime/google/appengine/_internal/django/core/serializers/pyyaml.py

@@ -51,6 +51,6 @@ def Deserializer(stream_or_string, **options):
         stream = StringIO(stream_or_string)
     else:
         stream = stream_or_string
-    for obj in PythonDeserializer(yaml.load(stream), **options):
+    for obj in PythonDeserializer(yaml.safe_load(stream), **options):
         yield obj
 

python_vm_runtime/google/appengine/_internal/graphy/backends/google_chart_api/encoders.py

@@ -43,7 +43,7 @@ class BaseChartEncoder(object):
 
   def __init__(self, chart):
     self.extra_params = {}  # You can add specific params here.
-    self.url_base = 'http://chart.apis.google.com/chart'
+    self.url_base = 'https://www.google.com/chart'
     self.formatters = self._GetFormatters()
     self.chart = chart
     self.enhanced_encoding = False