Merge "remove definitions of Python Source Code Encoding"

doc/user-guide/section_sdk_neutron.xml

@@ -98,8 +98,6 @@ def print_values_server(val, server_id, type):
         <title>Create network</title>
         <para>The following program creates a network:</para>
         <programlisting language="python">#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from neutronclient.v2_0 import client
 from credentials import get_credentials
 
@@ -127,8 +125,6 @@ finally:
         <title>List networks</title>
         <para>The following program lists networks:</para>
         <programlisting language="python">#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from neutronclient.v2_0 import client
 from credentials import get_credentials
 from utils import print_values
@@ -146,8 +142,6 @@ print_values(netw, 'networks')</programlisting>
         <title>Create ports</title>
         <para>The following program creates a port:</para>
         <programlisting language="python">#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from neutronclient.v2_0 import client
 import novaclient.v1_1.client as nvclient
 from credentials import get_credentials
@@ -188,8 +182,6 @@ if server_detail != None:
         <title>List ports</title>
         <para>The following program lists ports:</para>
         <programlisting language="python">#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from neutronclient.v2_0 import client
 from credentials import get_credentials
 from utils import print_values
@@ -210,8 +202,6 @@ print_values(ports, 'ports')</programlisting>
         <para>The following program lists the ports for a
             server:</para>
         <programlisting language="python">#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from neutronclient.v2_0 import client
 import novaclient.v1_1.client as nvclient
 from credentials import get_credentials
@@ -298,7 +288,6 @@ print("Execution Completed")</programlisting>
         <example>
             <title>Create router: complete code listing</title>
             <programlisting language="python">#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 from neutronclient.v2_0 import client
 import novaclient.v1_1.client as nvclient
 from credentials import get_credentials
@@ -378,7 +367,6 @@ print("Execution completed")</programlisting>
         <example>
             <title>Delete network: complete code listing</title>
             <programlisting language="python">#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 from neutronclient.v2_0 import client
 from credentials import get_credentials
 
@@ -443,8 +431,6 @@ print("Execution completed")</programlisting>
         <example>
             <title>List routers: complete code listing</title>
             <programlisting language="python">#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from neutronclient.v2_0 import client
 from credentials import get_credentials
 from utils import print_values
@@ -491,8 +477,6 @@ print(sg)</programlisting>
         <example>
             <title>List security groups: complete code listing</title>
             <programlisting language="python">#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from neutronclient.v2_0 import client
 from credentials import get_credentials
 from utils import print_values
@@ -542,8 +526,6 @@ print(subnets)</programlisting>
         <example>
             <title>List subnets: complete code listing</title>
             <programlisting language="python">#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from neutronclient.v2_0 import client
 from credentials import get_credentials
 from utils import print_values

doc/user-guide/section_sdk_nova.xml

@@ -65,7 +65,6 @@ from novaclient.client import Client</programlisting>
         <example>
             <title>List servers code listing</title>
             <programlisting language="python">#!/usr/bin/env python
-
 from credentials import get_nova_credentials_v2
 from novaclient.client import Client
 
@@ -129,7 +128,6 @@ print(nova_client.servers.list)</programlisting>
         <example>
             <title>Create server code listing</title>
             <programlisting language="python">#!/usr/bin/env python
-
 import time
 from credentials import get_nova_credentials_v2
 from novaclient.client import Client
@@ -219,7 +217,6 @@ for s in servers_list:
         <example>
             <title>Delete server code listing</title>
             <programlisting language="python">#!/usr/bin/env python
-
 from credentials import get_nova_credentials_v2
 from novaclient.client import Client
 

tools/generatepot

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 '''
 Created on 2012-7-3