Merge pull request #202 from stonebig/master

stonebig · stonebig · commit 02ddfc196676 · 2015-11-17T21:59:02.000+01:00
small tweak and package addition
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -113,6 +113,9 @@ description=serialize all of python (almost)
 description=Download, build, install, upgrade, and uninstall Python packages - easily
 category=deploy
 
+[distributed]
+description=Distributed computing
+
 [decorator]
 description=Better living through Python with decorators
 
@@ -426,6 +429,9 @@ category=improc
 description=A tool for installing and managing Python packages
 category=deploy
 
+[ply]
+description=Python Lex & Yacc
+
 [polygon2]
 description=Polygon2 is a Python-2 package that handles polygonal shapes in 2D
 
@@ -510,6 +516,9 @@ description=Logilab code analysis module: analyzes Python source code looking fo
 url=http://www.logilab.org/project/pylint
 category=util
 
+[pymc]
+description=Markov Chain Monte Carlo sampling toolkit.
+
 [pymeta3]
 description=Pattern-matching language based on Meta for Python 3 and 2
 
@@ -738,6 +747,9 @@ description=a graphic SQLite Client in 1 Python file
 [statsmodels]
 description=Statistical computations and models for use with SciPy
 
+[supersmoother]
+description=Python implementation of Friedman's Supersmoother
+
 [sympy]
 description=Symbolic Mathematics Library
 
@@ -825,5 +837,8 @@ description=A Python module for creating Excel XLSX files.
 description=Create spreadsheet files compatible with Microsoft Excel 97/2000/XP/2003 files, OpenOffice.org Calc, and Gnumeric
 category=dataproc
 
+[xonsh]
+description=an exotic, usable shell
+
 [xray]
 description=N-D labeled arrays and datasets in Python
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -371,9 +371,13 @@ def find_package(self, name):
             if pack.name == name:
                 return pack
 
+
     def uninstall_existing(self, package):
-        """Uninstall existing package"""
-        pack = self.find_package(package.name)
+        """Uninstall existing package (or package name)"""
+        if isinstance(package ,str):
+            pack = self.find_package(package)
+        else:
+            pack = self.find_package(package.name)
         if pack is not None:
             self.uninstall(pack)
 
