Expunge all python2 modules

2 files changed, 29 insertions, 2 deletions

diff --git a/calm/package.py b/calm/package.py
index f84d494..f70fb98 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -1636,10 +1636,10 @@ def mark_fn(packages, po, v, certain_age, vault_requests):
     # - if package depends on anything in expired_provides
     #
     requires = po.version_hints[v].get('depends', '').split(', ')
-    if re.match(r'^python(|2|27)-', pn):
+    if re.match(r'^python(|2|27)[-_]', pn):
         if any(ep in requires for ep in past_mistakes.expired_provides) or po.obsolete:
             logging.debug("package '%s' version '%s' not retained as it requires a provide known to be expired" % (pn, v))
-            return Freshness.conditional
+            return Freshness.stale
 
     # - explicitly marked as 'noretain'
     #
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index 5b7ddb1..c8fbde9 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -171,10 +171,37 @@ nonexistent_provides = historical_provides + [
     'python2',
     'python2-devel',
     'python27',
+    'python-appindicator',
+    'python-avahi',
+    'python-cairo',
+    'python-chardet',
+    'python-dbus',
+    'python-docutils',
+    'python-fontforge',
+    'python-gconf',
+    'python-gi',
+    'python-gnome2',
+    'python-gnomevfs2',
+    'python-gobject',
+    'python-gtk2.0',
+    'python-jinja2',
+    'python-keybinder',
     'python-lxml',
+    'python-marisa',
     'python-mx',
+    'python-numpy',
+    'python-orbit',
     'python-pygments',
+    'python-pykde4',
     'python-pynotify',
+    'python-pyqt4',
+    'python-rdflib',
+    'python-reportlab',
+    'python-twisted',
+    'python-vte',
+    'python-wnck',
+    'python-xdg',
+    'python-zeitgeist',
     '_windows',
     r'perl5_\d+',
     r'ruby_\d+',