From fac809a8d5bf04c6e168bf6d644b0153b88561ae Mon Sep 17 00:00:00 2001 From: lxnay Date: Sun, 15 Mar 2009 12:16:09 +0000 Subject: [PATCH] Entropy/*: - use print_traceback instead of printTraceback function (deprecated) - use get_traceback instead of getTraceback function (deprecated) git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@3182 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropy/client/interfaces/fetch.py | 2 +- .../entropy/client/interfaces/methods.py | 10 +++++----- .../entropy/client/interfaces/package.py | 6 +++--- .../entropy/client/interfaces/repository.py | 4 ++-- .../entropy/client/interfaces/trigger.py | 12 +++++------ .../entropy/client/services/ugc/commands.py | 2 +- libraries/entropy/db.py | 6 +++--- libraries/entropy/server/interfaces/main.py | 2 +- .../entropy/server/interfaces/mirrors.py | 16 +++++++-------- libraries/entropy/services/interfaces.py | 10 +++++----- .../entropy/services/repository/commands.py | 2 +- .../entropy/services/system/executors.py | 20 +++++++++---------- .../entropy/services/system/interfaces.py | 4 ++-- libraries/entropy/services/ugc/interfaces.py | 4 ++-- libraries/entropy/spm.py | 4 ++-- libraries/entropy/transceivers.py | 6 +++--- spritz/src/dialogs.py | 2 +- 17 files changed, 56 insertions(+), 56 deletions(-) diff --git a/libraries/entropy/client/interfaces/fetch.py b/libraries/entropy/client/interfaces/fetch.py index ba695c0e6..ec8cd7353 100644 --- a/libraries/entropy/client/interfaces/fetch.py +++ b/libraries/entropy/client/interfaces/fetch.py @@ -343,7 +343,7 @@ class Fetchers: type = "warning", header = red(" ## ") ) - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return -1, data_transfer, resumed if fetchChecksum == "-3": # not found diff --git a/libraries/entropy/client/interfaces/methods.py b/libraries/entropy/client/interfaces/methods.py index 681fe2867..20d8029f4 100644 --- a/libraries/entropy/client/interfaces/methods.py +++ b/libraries/entropy/client/interfaces/methods.py @@ -451,7 +451,7 @@ class Repository: db_path = etpConst['etpdatabaseclientfilepath'] if (not self.Client.noclientdb) and (not os.path.isfile(db_path)): conn = load_db_from_ram() - self.entropyTools.printTraceback(f = self.Client.clientLog) + self.entropyTools.print_traceback(f = self.Client.clientLog) else: conn = LocalRepository(readOnly = False, dbFile = db_path, clientDatabase = True, dbname = etpConst['clientdbid'], @@ -467,7 +467,7 @@ class Repository: conn.closeDB() except: pass - self.entropyTools.printTraceback(f = self.Client.clientLog) + self.entropyTools.print_traceback(f = self.Client.clientLog) conn = load_db_from_ram() if not etpConst['dbconfigprotect']: @@ -500,7 +500,7 @@ class Repository: try: self.clientDbconn.getPackageData(x) except Exception ,e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() errors = True self.updateProgress( darkred(_("Errors on idpackage %s, error: %s")) % (x,str(e)), @@ -605,7 +605,7 @@ class Repository: self.entropyTools.compress_file(dbpath, comp_dbpath, bz2.BZ2File, compress_level) except: if not silent: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False, _("Unable to compress") if not silent: @@ -654,7 +654,7 @@ class Repository: self.entropyTools.uncompress_file(backup_path, db_destination, bz2.BZ2File) except: if not silent: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False, _("Unable to unpack") if not silent: diff --git a/libraries/entropy/client/interfaces/package.py b/libraries/entropy/client/interfaces/package.py index 362e35caa..fa3d49d6b 100644 --- a/libraries/entropy/client/interfaces/package.py +++ b/libraries/entropy/client/interfaces/package.py @@ -307,7 +307,7 @@ class Package: ) return 3 except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() self.Entropy.clientLog.log( ETP_LOGPRI_INFO, ETP_LOGLEVEL_NORMAL, @@ -888,7 +888,7 @@ class Package: f.close() shutil.move(world_file_tmp,world_file) except (UnicodeDecodeError,UnicodeEncodeError), e: - self.entropyTools.printTraceback(f = self.Entropy.clientLog) + self.entropyTools.print_traceback(f = self.Entropy.clientLog) mytxt = brown(_("Cannot update Portage world file, destination %s is corrupted.") % (world_file,)) self.Entropy.updateProgress( red("QA: ")+mytxt+": "+unicode(e), @@ -1218,7 +1218,7 @@ class Package: do_continue = True except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() protected = False # safely revert to false tofile = tofile_before_protect mytxt = darkred("%s: %s") % (_("Cannot check CONFIG PROTECTION. Error"),e,) diff --git a/libraries/entropy/client/interfaces/repository.py b/libraries/entropy/client/interfaces/repository.py index 2ca7a17e5..3b1238a5c 100644 --- a/libraries/entropy/client/interfaces/repository.py +++ b/libraries/entropy/client/interfaces/repository.py @@ -991,7 +991,7 @@ class Repository: try: self.run_config_files_updates(repo) except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() mytxt = "%s: %s" % ( blue(_("Configuration files update error, not critical, continuing")), darkred(unicode(e)), @@ -1433,7 +1433,7 @@ class Repository: securityConn = self.Entropy.Security() securityConn.fetch_advisories() except Exception, e: - self.entropyTools.printTraceback(f = self.Entropy.clientLog) + self.entropyTools.print_traceback(f = self.Entropy.clientLog) mytxt = "%s: %s" % (red(_("Advisories fetch error")),e,) self.Entropy.updateProgress( mytxt, diff --git a/libraries/entropy/client/interfaces/trigger.py b/libraries/entropy/client/interfaces/trigger.py index 0ea141d58..6d6d44463 100644 --- a/libraries/entropy/client/interfaces/trigger.py +++ b/libraries/entropy/client/interfaces/trigger.py @@ -58,7 +58,7 @@ class Trigger: Spm = self.Entropy.Spm() self.Spm = Spm except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() mytxt = darkred("%s, %s: %s, %s !") % ( _("Portage interface can't be loaded"), _("Error"), @@ -252,7 +252,7 @@ class Trigger: return self.do_trigger_call_ext_generic() except Exception, e: mykey = self.pkgdata['category']+"/"+self.pkgdata['name'] - tb = self.entropyTools.getTraceback() + tb = self.entropyTools.get_traceback() self.Entropy.updateProgress(tb, importance = 0, type = "error") self.Entropy.clientLog.write(tb) self.Entropy.clientLog.log( @@ -922,7 +922,7 @@ class Trigger: except Exception, e: sys.stdout = oldstdout - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() self.Entropy.clientLog.log( ETP_LOGPRI_INFO, ETP_LOGLEVEL_NORMAL, @@ -996,7 +996,7 @@ class Trigger: ) except Exception, e: sys.stdout = oldstdout - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() self.Entropy.clientLog.log( ETP_LOGPRI_INFO, ETP_LOGLEVEL_NORMAL, @@ -1083,7 +1083,7 @@ class Trigger: except Exception, e: sys.stderr = oldstderr stdfile.close() - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() self.Entropy.clientLog.log( ETP_LOGPRI_INFO, ETP_LOGLEVEL_NORMAL, @@ -1171,7 +1171,7 @@ class Trigger: except Exception, e: sys.stderr = oldstderr stdfile.close() - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() self.Entropy.clientLog.log( ETP_LOGPRI_INFO, ETP_LOGLEVEL_NORMAL, diff --git a/libraries/entropy/client/services/ugc/commands.py b/libraries/entropy/client/services/ugc/commands.py index 030f4bdd9..34ef0138e 100644 --- a/libraries/entropy/client/services/ugc/commands.py +++ b/libraries/entropy/client/services/ugc/commands.py @@ -133,7 +133,7 @@ class Base: data = self.Service.receive() return data except: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return None def convert_stream_to_object(self, data, gzipped, repository = None, arch = None, product = None): diff --git a/libraries/entropy/db.py b/libraries/entropy/db.py index 27dc39595..9bd0c999a 100644 --- a/libraries/entropy/db.py +++ b/libraries/entropy/db.py @@ -854,7 +854,7 @@ class LocalRepository: try: self.runTreeUpdatesQuickpkgAction(quickpkg_atoms) except: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() mytxt = "%s: %s: %s, %s." % ( bold(_("WARNING")), red(_("Cannot complete quickpkg for atoms")), @@ -879,7 +879,7 @@ class LocalRepository: Exception, e, ) - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() # discard cache self.clearCache() @@ -1067,7 +1067,7 @@ class LocalRepository: mypath = os.path.join(mydest,os.path.basename(myatom)+etpConst['packagesext']) if os.path.isfile(mypath): os.remove(mypath) - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() mytxt = "%s: %s: %s, %s." % ( bold(_("WARNING")), red(_("Cannot complete quickpkg for atom")), diff --git a/libraries/entropy/server/interfaces/main.py b/libraries/entropy/server/interfaces/main.py index cbcf14590..6e80c792e 100644 --- a/libraries/entropy/server/interfaces/main.py +++ b/libraries/entropy/server/interfaces/main.py @@ -1278,7 +1278,7 @@ class Server(Singleton,TextInterface): idpackages_added.add(idpackage) to_be_injected.add((idpackage,destination_path)) except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() self.updateProgress( "[repo:%s] %s: %s" % ( darkgreen(repo), diff --git a/libraries/entropy/server/interfaces/mirrors.py b/libraries/entropy/server/interfaces/mirrors.py index 76e2bc314..62c90a129 100644 --- a/libraries/entropy/server/interfaces/mirrors.py +++ b/libraries/entropy/server/interfaces/mirrors.py @@ -97,7 +97,7 @@ class Server: try: ftp = self.FtpInterface(uri, self.Entropy) except ConnectionError: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return True # issues my_path = os.path.join(self.Entropy.get_remote_database_relative_path(repo),etpConst['branch']) ftp.set_cwd(my_path, dodir = True) @@ -177,7 +177,7 @@ class Server: try: ftp = self.FtpInterface(uri, self.Entropy) except ConnectionError: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return True # issues my_path = os.path.join(self.Entropy.get_remote_database_relative_path(repo),etpConst['branch']) ftp.set_cwd(my_path, dodir = True) @@ -228,7 +228,7 @@ class Server: try: ftp_connection = self.FtpInterface(uri, self.Entropy) except ConnectionError: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False # issues ftp_connection.set_cwd(my_path, dodir = True) else: @@ -289,7 +289,7 @@ class Server: try: ftp_connection = self.FtpInterface(uri, self.Entropy) except ConnectionError: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False # issues ftp_connection.set_cwd(my_path) else: @@ -410,7 +410,7 @@ class Server: try: ftp = self.FtpInterface(uri, self.Entropy) except ConnectionError: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False # issues dirpath = os.path.join(self.Entropy.get_remote_packages_relative_path(repo),pkg_to_join_dirpath) ftp.set_cwd(dirpath, dodir = True) @@ -1163,7 +1163,7 @@ class Server: try: ftp = self.FtpInterface(uri, self.Entropy) except ConnectionError: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return True # gave up my_path = os.path.join(self.Entropy.get_remote_database_relative_path(repo),etpConst['branch']) ftp.set_cwd(my_path, dodir = True) @@ -1244,7 +1244,7 @@ class Server: dbconn.removeTreeUpdatesActions(repo) dbconn.insertTreeUpdatesActions(all_actions,repo) except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() mytxt = "%s, %s: %s. %s" % ( _("Troubles with treeupdates"), _("error"), @@ -2458,7 +2458,7 @@ class Server: except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() mirrors_errors = True broken_mirrors.add(uri) self.Entropy.updateProgress( diff --git a/libraries/entropy/services/interfaces.py b/libraries/entropy/services/interfaces.py index 728ce8a25..f96657d4b 100644 --- a/libraries/entropy/services/interfaces.py +++ b/libraries/entropy/services/interfaces.py @@ -453,7 +453,7 @@ class SocketHost: self.data_counter = None except ValueError: - #self.entropyTools.printTraceback() + #self.entropyTools.print_traceback() self.server.processor.HostInterface.updateProgress( 'interrupted: %s, reason: %s - from client: %s' % ( self.server.server_address, @@ -592,7 +592,7 @@ class SocketHost: ) ) # print exception - tb = self.entropyTools.getTraceback() + tb = self.entropyTools.get_traceback() print tb self.server.processor.HostInterface.socketLog.write(tb) break @@ -738,7 +738,7 @@ class SocketHost: e, ) ) - tb = self.entropyTools.getTraceback() + tb = self.entropyTools.get_traceback() print tb self.server.processor.HostInterface.socketLog.write(tb) return "close" @@ -749,7 +749,7 @@ class SocketHost: e, ) ) - tb = self.entropyTools.getTraceback() + tb = self.entropyTools.get_traceback() print tb self.server.processor.HostInterface.socketLog.write(tb) return "close" @@ -817,7 +817,7 @@ class SocketHost: return "close" except Exception, e: # write to self.HostInterface.socketLog - tb = self.entropyTools.getTraceback() + tb = self.entropyTools.get_traceback() print tb self.HostInterface.socketLog.write(tb) # store error diff --git a/libraries/entropy/services/repository/commands.py b/libraries/entropy/services/repository/commands.py index a3f9d43ee..a788d1ae2 100644 --- a/libraries/entropy/services/repository/commands.py +++ b/libraries/entropy/services/repository/commands.py @@ -235,7 +235,7 @@ class Repository(SocketCommands): trigger_unicode = True ) except: - tb = self.entropyTools.getTraceback() + tb = self.entropyTools.get_traceback() print tb self.HostInterface.socketLog.write(tb) dbconn.closeDB() diff --git a/libraries/entropy/services/system/executors.py b/libraries/entropy/services/system/executors.py index 8d8939455..8a4e22896 100644 --- a/libraries/entropy/services/system/executors.py +++ b/libraries/entropy/services/system/executors.py @@ -627,7 +627,7 @@ class Base: deps_not_matched = self.SystemManagerExecutor.SystemInterface.Entropy.dependencies_test() return True,deps_not_matched except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False,unicode(e) finally: sys.stdout.write("\n### Done ###\n") @@ -660,7 +660,7 @@ class Base: try: return self.SystemManagerExecutor.SystemInterface.Entropy.libraries_test() except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False,unicode(e) finally: sys.stdout.write("\n### Done ###\n") @@ -701,7 +701,7 @@ class Base: data = self.SystemManagerExecutor.SystemInterface.Entropy.verify_remote_packages([], ask = False, repo = repoid) return True, data except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False,unicode(e) finally: sys.stdout.write("\n### Done ###\n") @@ -739,7 +739,7 @@ class Base: ) dbconn.closeDB() except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False,unicode(e) finally: sys.stdout.write("\n### Done ###\n") @@ -790,7 +790,7 @@ class Base: upload_queue, download_queue, removal_queue, \ fine_queue, remote_packages_data = Entropy.MirrorsService.calculate_packages_to_sync(uri, etpConst['branch'], repoid) except socket.error: - self.entropyTools.printTraceback(f = stdout_err) + self.entropyTools.print_traceback(f = stdout_err) stdout_err.write("\n"+_("Socket error, continuing...").encode('utf-8')+"\n") continue @@ -826,7 +826,7 @@ class Base: return True, repo_data except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False,unicode(e) finally: sys.stdout.write("\n### Done ###\n") @@ -944,7 +944,7 @@ class Base: return True, repo_data except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False,unicode(e) finally: sys.stdout.write("\n### Done ###\n") @@ -993,7 +993,7 @@ class Base: return False,None return True,data except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False,unicode(e) finally: sys.stdout.write("\n### Done ###\n") @@ -1029,7 +1029,7 @@ class Base: self.SystemManagerExecutor.SystemInterface.Entropy.MirrorsService.upload_notice_board(repo = repoid) return True,data except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False,unicode(e) finally: sys.stdout.write("\n### Done ###\n") @@ -1063,7 +1063,7 @@ class Base: data = self.SystemManagerExecutor.SystemInterface.Entropy.MirrorsService.update_notice_board(title, notice_text, link = link, repo = repoid) return True,data except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return False,unicode(e) finally: sys.stdout.write("\n### Done ###\n") diff --git a/libraries/entropy/services/system/interfaces.py b/libraries/entropy/services/system/interfaces.py index 1da23220f..0cc92889d 100644 --- a/libraries/entropy/services/system/interfaces.py +++ b/libraries/entropy/services/system/interfaces.py @@ -429,7 +429,7 @@ class Server(SocketHost): queue_id = self.ManagerQueue['queue_order'].pop(0) return self.ManagerQueue['queue'].pop(queue_id), queue_id except (IndexError,KeyError,): - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return None, None def _queue_copy_obj(self, obj): @@ -479,7 +479,7 @@ class Server(SocketHost): done, result = self.SystemExecutor.execute_task(command_data) except Exception, e: if self.QueueLock.locked(): self.QueueLock.release() - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() done = False result = (False, unicode(e),) diff --git a/libraries/entropy/services/ugc/interfaces.py b/libraries/entropy/services/ugc/interfaces.py index e60379eb5..e4a71875e 100644 --- a/libraries/entropy/services/ugc/interfaces.py +++ b/libraries/entropy/services/ugc/interfaces.py @@ -1766,7 +1766,7 @@ class Client: data = self.receive() except self.socket.error, e: if etpUi['debug']: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() import pdb pdb.set_trace() if e[0] == 32: # broken pipe @@ -1852,7 +1852,7 @@ class Client: header = self.output_header ) if etpUi['debug']: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() import pdb pdb.set_trace() return None diff --git a/libraries/entropy/spm.py b/libraries/entropy/spm.py index d59d8fa2f..2b646d9ee 100644 --- a/libraries/entropy/spm.py +++ b/libraries/entropy/spm.py @@ -173,7 +173,7 @@ class PortagePlugin: filename = etpConst['spmlogfile'], header = "[spm]" ) - self.entropyTools.printTraceback(f = spmLog) + self.entropyTools.print_traceback(f = spmLog) spmLog.flush() spmLog.close() @@ -962,7 +962,7 @@ class PortagePlugin: deps = self.usedeps_reduce(deps) deps = ' '.join(deps) except Exception, e: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() self.updateProgress( darkred("%s: %s: %s :: %s") % ( _("Error calculating dependencies"), diff --git a/libraries/entropy/transceivers.py b/libraries/entropy/transceivers.py index 6555caafa..72880b867 100644 --- a/libraries/entropy/transceivers.py +++ b/libraries/entropy/transceivers.py @@ -824,7 +824,7 @@ class FtpInterface: except Exception, e: # connection reset by peer - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() mytxt = red("%s: %s, %s... #%s") % ( _("Upload issue"), e, @@ -900,7 +900,7 @@ class FtpInterface: except Exception, e: # connection reset by peer - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() mytxt = red("%s: %s, %s... #%s") % ( _("Download issue"), e, @@ -1179,7 +1179,7 @@ class FtpServerHandler: try: ftp = self.FtpInterface(uri, self.Entropy) except ConnectionError: - self.entropyTools.printTraceback() + self.entropyTools.print_traceback() return True,fine_uris,broken_uris # issues my_path = os.path.join(self.Entropy.get_remote_database_relative_path(self.repo),etpConst['branch']) self.Entropy.updateProgress( diff --git a/spritz/src/dialogs.py b/spritz/src/dialogs.py index cf90fd5a6..2b8ee2818 100644 --- a/spritz/src/dialogs.py +++ b/spritz/src/dialogs.py @@ -6013,7 +6013,7 @@ class ExceptionDialog: def show(self): import entropy.tools from entropy.qa import ErrorReportInterface - errmsg = entropy.tools.getTraceback() + errmsg = entropy.tools.get_traceback() conntest = entropy.tools.get_remote_data(etpConst['conntestlink']) rc, (name,mail,description) = errorMessage( None,