Sync code from internal source control

Author: Qingtang-SDK

aliyun-python-sdk-core/aliyunsdkcore/__init__.py

@@ -1,2 +1,2 @@
 __author__ = 'alex jiang'
-__version__ = '2.1.2'
+__version__ = '2.1.3'

aliyun-python-sdk-core/aliyunsdkcore/acs_exception/error_msg.py

@@ -28,7 +28,7 @@
 """
 
 __dict = dict(SDK_INVALID_REGION_ID='Can not find endpoint to access.',
-              SDK_SERVER_UNREACHABLE='Specified endpoint or uri is not valid.',
+              SDK_SERVER_UNREACHABLE='Unable to connect server',
               SDK_INVALID_REQUEST='The request is not a valid AcsRequest.',
               SDK_MISSING_ENDPOINTS_FILER='Internal endpoints info is missing.')
 

aliyun-python-sdk-core/aliyunsdkcore/client.py

@@ -174,8 +174,8 @@ def do_action(self, acs_request):
             # if _body is None:
             # 	raise exs.ClientException(error_code.SDK_SERVER_UNREACHABLE, error_msg.get_msg('SDK_SERVER_UNREACHABLE'))
             return _body
-        except IOError:
-            raise exs.ClientException(error_code.SDK_SERVER_UNREACHABLE, error_msg.get_msg('SDK_SERVER_UNREACHABLE'))
+        except IOError, e:
+            raise exs.ClientException(error_code.SDK_SERVER_UNREACHABLE, error_msg.get_msg('SDK_SERVER_UNREACHABLE') + ': ' + str(e))
         except AttributeError:
             raise exs.ClientException(error_code.SDK_INVALID_REQUEST, error_msg.get_msg('SDK_INVALID_REQUEST'))
 
@@ -209,8 +209,8 @@ def get_response(self, acs_request):
                                          content, self.__port)
             return _response.get_response_object()
 
-        except IOError:
-            raise exs.ClientException(error_code.SDK_SERVER_UNREACHABLE, error_msg.get_msg('SDK_SERVER_UNREACHABLE'))
+        except IOError, e:
+            raise exs.ClientException(error_code.SDK_SERVER_UNREACHABLE, error_msg.get_msg('SDK_SERVER_UNREACHABLE') + ': ' + str(e))
         except AttributeError:
             raise exs.ClientException(error_code.SDK_INVALID_REQUEST, error_msg.get_msg('SDK_INVALID_REQUEST'))
 

aliyun-python-sdk-core/aliyunsdkcore/http/http_response.py

@@ -65,8 +65,6 @@ def get_http_response(self):
 			                          headers=self.get_headers())
 			response=self.__connection.getresponse()
 			return response.getheaders(),response.read()
-		except Exception as e:
-			return None, None
 		finally:
 			self.__close_connection()
 
@@ -81,8 +79,6 @@ def get_http_response_object(self):
 			                          headers=self.get_headers())
 			response=self.__connection.getresponse()
 			return response.status,response.getheaders(),response.read()
-		except Exception as e:
-			return None, None
 		finally:
 			self.__close_connection()
 
@@ -99,8 +95,6 @@ def get_https_response(self):
 			                          headers=self.get_headers())
 			response=self.__connection.getresponse()
 			return response.getheaders(),response.read()
-		except Exception as e:
-			return None, None
 		finally:
 			self.__close_connection()
 
@@ -117,17 +111,13 @@ def get_https_response_object(self):
 			                          headers=self.get_headers())
 			response=self.__connection.getresponse()
 			return response.status,response.getheaders(),response.read()
-		except Exception as e:
-			return None, None
 		finally:
 			self.__close_connection()
 
 
 	def __close_connection(self):
-		try:
-			if self.__connection is not None:
-				self.__connection.close()
-		except Exception as e:
-			pass
+		if self.__connection is not None:
+		    self.__connection.close()
+		    self.__connection = None
 
 

aliyun-python-sdk-core/aliyunsdkcore/profile/region_provider.py

@@ -62,7 +62,7 @@
 
         __endpoints[endpoint.getAttribute('name')] = dict(regions=region_list, products=product_list)
 
-except Exception:
+except Exception, ex:
     raise ClientException(error_code.SDK_MISSING_ENDPOINTS_FILER, error_msg.get_msg('SDK_MISSING_ENDPOINTS_FILER'))
 
 

aliyun-python-sdk-live/aliyunsdklive/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.2'
+__version__ = '2.1.0'

aliyun-python-sdk-live/aliyunsdklive/request/v20161101/AddLiveAppRecordConfigRequest.py

@@ -23,12 +23,6 @@ class AddLiveAppRecordConfigRequest(RpcRequest):
 	def __init__(self):
 		RpcRequest.__init__(self, 'live', '2016-11-01', 'AddLiveAppRecordConfig','live')
 
-	def get_RecordFormat(self):
-		return self.get_query_params().get('RecordFormat')
-
-	def set_RecordFormat(self,RecordFormat):
-		self.add_query_param('RecordFormat',RecordFormat)
-
 	def get_SecurityToken(self):
 		return self.get_query_params().get('SecurityToken')
 
@@ -63,4 +57,10 @@ def get_OssBucket(self):
 		return self.get_query_params().get('OssBucket')
 
 	def set_OssBucket(self,OssBucket):
-		self.add_query_param('OssBucket',OssBucket)
+		self.add_query_param('OssBucket',OssBucket)
+
+	def get_RecordFormat(self):
+		return self.get_query_params().get('RecordFormat')
+
+	def set_RecordFormat(self,RecordFormat):
+		self.add_query_param('RecordFormat',RecordFormat)

aliyun-python-sdk-live/aliyunsdklive/request/v20161101/AddLiveStreamTranscodeRequest.py

@@ -0,0 +1,54 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from aliyunsdkcore.request import RpcRequest
+class AddLiveStreamTranscodeRequest(RpcRequest):
+
+	def __init__(self):
+		RpcRequest.__init__(self, 'live', '2016-11-01', 'AddLiveStreamTranscode','live')
+
+	def get_SecurityToken(self):
+		return self.get_query_params().get('SecurityToken')
+
+	def set_SecurityToken(self,SecurityToken):
+		self.add_query_param('SecurityToken',SecurityToken)
+
+	def get_OwnerId(self):
+		return self.get_query_params().get('OwnerId')
+
+	def set_OwnerId(self,OwnerId):
+		self.add_query_param('OwnerId',OwnerId)
+
+	def get_Domain(self):
+		return self.get_query_params().get('Domain')
+
+	def set_Domain(self,Domain):
+		self.add_query_param('Domain',Domain)
+
+	def get_App(self):
+		return self.get_query_params().get('App')
+
+	def set_App(self,App):
+		self.add_query_param('App',App)
+
+	def get_Template(self):
+		return self.get_query_params().get('Template')
+
+	def set_Template(self,Template):
+		self.add_query_param('Template',Template)

aliyun-python-sdk-live/aliyunsdklive/request/v20161101/DeleteLiveStreamTranscodeRequest.py

@@ -0,0 +1,54 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from aliyunsdkcore.request import RpcRequest
+class DeleteLiveStreamTranscodeRequest(RpcRequest):
+
+	def __init__(self):
+		RpcRequest.__init__(self, 'live', '2016-11-01', 'DeleteLiveStreamTranscode','live')
+
+	def get_SecurityToken(self):
+		return self.get_query_params().get('SecurityToken')
+
+	def set_SecurityToken(self,SecurityToken):
+		self.add_query_param('SecurityToken',SecurityToken)
+
+	def get_OwnerId(self):
+		return self.get_query_params().get('OwnerId')
+
+	def set_OwnerId(self,OwnerId):
+		self.add_query_param('OwnerId',OwnerId)
+
+	def get_Domain(self):
+		return self.get_query_params().get('Domain')
+
+	def set_Domain(self,Domain):
+		self.add_query_param('Domain',Domain)
+
+	def get_App(self):
+		return self.get_query_params().get('App')
+
+	def set_App(self,App):
+		self.add_query_param('App',App)
+
+	def get_Template(self):
+		return self.get_query_params().get('Template')
+
+	def set_Template(self,Template):
+		self.add_query_param('Template',Template)

aliyun-python-sdk-live/aliyunsdklive/request/v20161101/DescribeLiveStreamOnlineUserNumRequest.py

@@ -0,0 +1,72 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from aliyunsdkcore.request import RpcRequest
+class DescribeLiveStreamOnlineUserNumRequest(RpcRequest):
+
+	def __init__(self):
+		RpcRequest.__init__(self, 'live', '2016-11-01', 'DescribeLiveStreamOnlineUserNum','live')
+
+	def get_SecurityToken(self):
+		return self.get_query_params().get('SecurityToken')
+
+	def set_SecurityToken(self,SecurityToken):
+		self.add_query_param('SecurityToken',SecurityToken)
+
+	def get_OwnerId(self):
+		return self.get_query_params().get('OwnerId')
+
+	def set_OwnerId(self,OwnerId):
+		self.add_query_param('OwnerId',OwnerId)
+
+	def get_DomainName(self):
+		return self.get_query_params().get('DomainName')
+
+	def set_DomainName(self,DomainName):
+		self.add_query_param('DomainName',DomainName)
+
+	def get_AppName(self):
+		return self.get_query_params().get('AppName')
+
+	def set_AppName(self,AppName):
+		self.add_query_param('AppName',AppName)
+
+	def get_StreamName(self):
+		return self.get_query_params().get('StreamName')
+
+	def set_StreamName(self,StreamName):
+		self.add_query_param('StreamName',StreamName)
+
+	def get_StartTime(self):
+		return self.get_query_params().get('StartTime')
+
+	def set_StartTime(self,StartTime):
+		self.add_query_param('StartTime',StartTime)
+
+	def get_EndTime(self):
+		return self.get_query_params().get('EndTime')
+
+	def set_EndTime(self,EndTime):
+		self.add_query_param('EndTime',EndTime)
+
+	def get_HlsSwitch(self):
+		return self.get_query_params().get('HlsSwitch')
+
+	def set_HlsSwitch(self,HlsSwitch):
+		self.add_query_param('HlsSwitch',HlsSwitch)