ubuntukylin-members team mailing list archive
-
ubuntukylin-members team
-
Mailing list archive
-
Message #03170
[Merge] lp:~xnox/ubuntu-kylin-software-center/invalid-syntax into lp:ubuntu-kylin-software-center
Dimitri John Ledkov has proposed merging lp:~xnox/ubuntu-kylin-software-center/invalid-syntax into lp:ubuntu-kylin-software-center.
Requested reviews:
Ubuntu Kylin Members (ubuntukylin-members)
For more details, see:
https://code.launchpad.net/~xnox/ubuntu-kylin-software-center/invalid-syntax/+merge/215325
--
https://code.launchpad.net/~xnox/ubuntu-kylin-software-center/invalid-syntax/+merge/215325
Your team Ubuntu Kylin Members is requested to review the proposed merge of lp:~xnox/ubuntu-kylin-software-center/invalid-syntax into lp:ubuntu-kylin-software-center.
=== modified file 'backend/installbackend.py'
--- backend/installbackend.py 2014-04-10 07:46:25 +0000
+++ backend/installbackend.py 2014-04-11 00:44:20 +0000
@@ -65,7 +65,7 @@
try:
bus = dbus.SystemBus(mainloop)
except:
- print ("could not initiate dbus")
+ print "could not initiate dbus"
self.emit(Signals.init_models_ready,"fail","初始化失败!")
return False
@@ -85,7 +85,7 @@
# bus_name = dbus.service.BusName('com.ubuntukylin.softwarecenter', bus)
# self.dbusControler = SoftwarecenterDbusController(self, bus_name)
self.emit(Signals.init_models_ready,"fail","初始化失败!")
- print("dbus.DBusException error")
+ print "dbus.DBusException error"
return False
return True
=== modified file 'backend/reviewratingspawn.py'
--- backend/reviewratingspawn.py 2014-04-10 07:46:25 +0000
+++ backend/reviewratingspawn.py 2014-04-11 00:44:20 +0000
@@ -147,17 +147,17 @@
piston_reviews = rnrclient.get_reviews(**kwargs)
# piston_reviews = rnrclient.get_reviews(packagename="gimp",language='zh_CN')
except ValueError as e:
- print("failed to parse '%s'" % e)
+ print "failed to parse '%s'" % e
#bug lp:709408 - don't print 404 errors as traceback when api request
# returns 404 error
except APIError as e:
- print("_get_reviews_threaded: no reviews able to be retrieved: %s" % e)
+ print "_get_reviews_threaded: no reviews able to be retrieved: %s" % e
except httplib2.ServerNotFoundError:
# switch to offline mode and try again
rnrclient._offline_mode = True
piston_reviews = rnrclient.get_reviews(**kwargs)
except:
- print("get_reviews*****")
+ print "get_reviews*****"
if piston_reviews is None:
piston_reviews = []
@@ -197,7 +197,7 @@
localFile.write(rawContent)
localFile.close()
else:
- print("get_screenshots,exists:",thumbnailfile)
+ print "get_screenshots,exists:",thumbnailfile
screenshot_path_list.append(thumbnailfile)
queue.put_nowait(thumbnailfile)
@@ -209,13 +209,13 @@
localFile.write(rawContent)
localFile.close()
else:
- print("get_screenshots,exists:",screenshotfile)
+ print "get_screenshots,exists:",screenshotfile
screenshot_path_list.append(screenshotfile)
queue.put_nowait(screenshotfile)
except urllib2.HTTPError,e:
- print(e.code)
+ print e.code
except urllib2.URLError,e:
- print(str(e))
+ print str(e)
return screenshot_path_list
else:
@@ -229,9 +229,9 @@
if not rawContent:
return []
except urllib2.HTTPError,e:
- print(e.code)
+ print e.code
except urllib2.URLError,e:
- print(str(e))
+ print str(e)
if rawContent is None:
return []
@@ -239,7 +239,7 @@
try:
jsonContent = json.loads(rawContent)
except ValueError as e:
- print("can not decode: '%s' (%s)" % (rawContent, e))
+ print "can not decode: '%s' (%s)" % (rawContent, e)
jsonContent = None
return []
@@ -273,9 +273,9 @@
queue.put_nowait(destfile)
except urllib2.HTTPError,e:
- print(e.code)
+ print e.code
except urllib2.URLError,e:
- print(str(e))
+ print str(e)
return screenshot_path_list
@@ -304,14 +304,14 @@
try:
queue.put_nowait(rnrStat)
except Queue.Full:
- print("queue put exception")
+ print "queue put exception"
LOG.debug("got the rating and review list count:%d",len(rnrArray))
return rnrArray
except Exception as e:
LOG.error("exception when getting rating and review stat...")
- print(e.args)
+ print e.args
return {}
@@ -387,8 +387,8 @@
return rnrStatList
except Exception as e:
- print("Error in RatingList.get_rating_list(): ")
- print(e.args)
+ print "Error in RatingList.get_rating_list(): "
+ print e.args
return resList
=== modified file 'backend/search.py'
--- backend/search.py 2014-04-10 07:46:25 +0000
+++ backend/search.py 2014-04-11 00:44:20 +0000
@@ -383,7 +383,7 @@
APT_XAPIAN_INDEX_DB_PATH)
# self.db.add_database(axi)
except:
- print("failed to add apt-xapian-index")
+ print "failed to add apt-xapian-index"
LOG.exception("failed to add apt-xapian-index")
def search_software(self, keyword):
@@ -394,7 +394,7 @@
enquire = xapian.Enquire(self.db.xapiandb)
enquire.set_query(query[1])
matches = enquire.get_mset(0, len(self.db))
- print("res len=",len(self.db),len(matches))
+ print "res len=",len(self.db),len(matches)
pkgnamelist = []
for m in matches:
doc = m.document
@@ -437,7 +437,7 @@
for item in matches:
doc = item.document
pkgname = doc.get_value(XapianValues.PKGNAME)
- print("item:",count,pkgname)
+ print "item:",count,pkgname
count += 1
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-10 17:05:02 +0000
+++ debian/changelog 2014-04-11 00:44:20 +0000
@@ -1,3 +1,12 @@
+ubuntu-kylin-software-center (0.2.9.2) UNRELEASED; urgency=medium
+
+ * Revert to using print statement consistently through all
+ code-base. Print functions were only partially used within some files,
+ yet an import from future was not added, nor the rest of prints
+ converted.
+
+ -- Dimitri John Ledkov <xnox@xxxxxxxxxx> Fri, 11 Apr 2014 01:39:05 +0100
+
ubuntu-kylin-software-center (0.2.9.1) trusty; urgency=medium
* Switch package to native, remove broken watch file
=== modified file 'models/appmanager.py'
--- models/appmanager.py 2014-03-25 13:11:23 +0000
+++ models/appmanager.py 2014-04-11 00:44:20 +0000
@@ -607,11 +607,11 @@
print "\n***Enter _reviews_ready_callback..."
print str_pkgname
for review in reviews_data:
- print("rating: %s user=%s" % (review.rating,
- review.reviewer_username))
- print(review.summary)
- print(review.review_text)
- print("\n")
+ print "rating: %s user=%s" % (review.rating,
+ review.reviewer_username)
+ print review.summary
+ print review.review_text
+ print "\n"
print "\n\n"
=== modified file 'ubuntu-kylin-software-center.py'
--- ubuntu-kylin-software-center.py 2014-04-10 07:46:25 +0000
+++ ubuntu-kylin-software-center.py 2014-04-11 00:44:20 +0000
@@ -599,12 +599,12 @@
def del_task_item(self, pkgname):
count = self.ui.taskListWidget.count()
- print("del_task_item:",count)
+ print "del_task_item:",count
for i in range(count):
item = self.ui.taskListWidget.item(i)
taskitem = self.ui.taskListWidget.itemWidget(item)
if taskitem.app.name == pkgname:
- print("del_task_item: found an item",i,pkgname)
+ print "del_task_item: found an item",i,pkgname
delitem = self.ui.taskListWidget.takeItem(i)
self.ui.taskListWidget.removeItemWidget(delitem)
del delitem
@@ -698,7 +698,7 @@
def slot_rating_reviews_ready(self,rnrlist):
LOG.debug("receive ratings and reviews ready, count is %d", len(rnrlist))
- print("receive ratings and reviews ready, count is:",len(rnrlist))
+ print "receive ratings and reviews ready, count is:",len(rnrlist)
#app = self.appmgr.get_application_by_name("gimp")
#self.appmgr.update_rating_reviews(rnrlist)
@@ -934,7 +934,7 @@
self.history.history_add(self.slot_show_app_detail, app)
if(app is None):
- print("has no such application....")
+ print "has no such application...."
return
self.reset_nav_bar()
@@ -1028,7 +1028,7 @@
# call the backend models update opeartion
def slot_apt_process_finish(self,pkgname,action):
- print("slot_apt_process_finish:",pkgname,action)
+ print "slot_apt_process_finish:",pkgname,action
self.appmgr.update_models(action,pkgname)
References
