openstack/deb-python-ceilometerclient
Code Issues Proposed changes

Translate print statement to print function

Browse Source 
Use "from __future__ import print_function"
docs.python.org/3/howto/pyporting.html#from-future-import-print-function

Partial Implement: blueprint py33-support

Change-Id: I92fc07257851795a9972c8273d3278c8679d6628
This commit is contained in:
Kui Shi
2013-10-14 16:56:20 +08:00
parent c6ca94982d
commit 39328adaff
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ceilometerclient/common/utils.py
View File

@@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from __future__ import print_function
import os import os
import sys import sys
import textwrap import textwrap
@@ -59,7 +60,7 @@ def print_list(objs, fields, field_labels, formatters={}, sortby=0):
data = getattr(o, field, '') data = getattr(o, field, '')
row.append(data) row.append(data)
pt.add_row(row) pt.add_row(row)
print pt.get_string(sortby=field_labels[sortby]) print(pt.get_string(sortby=field_labels[sortby]))
def print_dict(d, dict_property="Property", wrap=0): def print_dict(d, dict_property="Property", wrap=0):
@@ -84,7 +85,7 @@ def print_dict(d, dict_property="Property", wrap=0):
if wrap > 0: if wrap > 0:
v = textwrap.fill(str(v), wrap) v = textwrap.fill(str(v), wrap)
pt.add_row([k, v]) pt.add_row([k, v])
print pt.get_string() print(pt.get_string())
def find_resource(manager, name_or_id): def find_resource(manager, name_or_id):
@@ -171,5 +172,5 @@ def merge_nested_dict(dest, source, depth=0):
def exit(msg=''): def exit(msg=''):
if msg: if msg:
print >> sys.stderr, msg print(msg, file=sys.stderr)
sys.exit(1) sys.exit(1)

10
ceilometerclient/tests/test_http.py
View File

@@ -13,11 +13,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from __future__ import print_function
from ceilometerclient.tests import utils from ceilometerclient.tests import utils
from ceilometerclient.common import http from ceilometerclient.common import http
fixtures = {} fixtures = {}
@@ -26,23 +26,23 @@ class HttpClientTest(utils.BaseTestCase):
def test_url_generation_trailing_slash_in_base(self): def test_url_generation_trailing_slash_in_base(self):
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
url = client._make_connection_url('/v1/resources') url = client._make_connection_url('/v1/resources')
print client.connection_params print(client.connection_params)
self.assertEqual(url, '/v1/resources') self.assertEqual(url, '/v1/resources')
def test_url_generation_without_trailing_slash_in_base(self): def test_url_generation_without_trailing_slash_in_base(self):
client = http.HTTPClient('http://localhost') client = http.HTTPClient('http://localhost')
url = client._make_connection_url('/v1/resources') url = client._make_connection_url('/v1/resources')
print client.connection_params print(client.connection_params)
self.assertEqual(url, '/v1/resources') self.assertEqual(url, '/v1/resources')
def test_url_generation_prefix_slash_in_path(self): def test_url_generation_prefix_slash_in_path(self):
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
url = client._make_connection_url('/v1/resources') url = client._make_connection_url('/v1/resources')
print client.connection_params print(client.connection_params)
self.assertEqual(url, '/v1/resources') self.assertEqual(url, '/v1/resources')
def test_url_generation_without_prefix_slash_in_path(self): def test_url_generation_without_prefix_slash_in_path(self):
client = http.HTTPClient('http://localhost') client = http.HTTPClient('http://localhost')
url = client._make_connection_url('v1/resources') url = client._make_connection_url('v1/resources')
print client.connection_params print(client.connection_params)
self.assertEqual(url, '/v1/resources') self.assertEqual(url, '/v1/resources')