From 62a7342edb16c38e3d646cc731a4a50ad6657b4f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 9 Mar 2010 14:15:47 +0100
Subject: python/generic.cc: use std::string instead of string

---
 python/generic.cc  | 4 ++--
 python/progress.cc | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'python')

diff --git a/python/generic.cc b/python/generic.cc
index 640f0862..b0770e02 100644
--- a/python/generic.cc
+++ b/python/generic.cc
@@ -31,11 +31,11 @@ PyObject *HandleErrors(PyObject *Res)
       Py_DECREF(Res);
    }
 
-   string Err;
+   std::string Err;
    int errcnt = 0;
    while (_error->empty() == false)
    {
-      string Msg;
+      std::string Msg;
       bool Type = _error->PopMessage(Msg);
       if (errcnt > 0)
          Err.append(", ");
diff --git a/python/progress.cc b/python/progress.cc
index 18081690..097f06cf 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -491,7 +491,6 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
 
    StartUpdate();
 
-
    PyCbObj_END_ALLOW_THREADS
    if(PyObject_HasAttrString(callbackInst, "waitChild") ||
       PyObject_HasAttrString(callbackInst, "wait_child")) {
-- 
cgit v1.2.3