Fedora 6 -> 7 yields missing Python module

I just upgraded from Fedora 6 to Fedora 7 (Fedora 8 will not install due 
to a halt during the dependencies check), and yum complains about a 
missing python module, "rpm".  Looking at the python libraries I see the 
sturcture of the rpm related files has changed considerably.

Any suggestions on a quick fix to the problem would be much appreciated. 
  Here's the output of the a simple command "yum":

========================================================
There was a problem importing one of the Python modules
required to run yum. The error leading to this problem was:

    No module named rpm

Please install a package which provides this module, or
verify that the module is installed correctly.

It's possible that the above module doesn't match the
current version of Python, which is:
2.5 (r25:51908, Apr 10 2007, 10:29:13)
[GCC 4.1.2 20070403 (Red Hat 4.1.2-8)]

If you cannot solve this problem yourself, please go to
the yum faq at:
   http://wiki.linux.duke.edu/YumFaq
=======================================================

Here are the directory listings from

/usr/lib/python2.4/site-packages/rpm/:

-rwxr-xr-x 1 root root    296 2007-10-25 06:19 __init__.py*
-rw-r--r-- 1 root root    428 2007-10-25 06:20 __init__.pyc
-rw-r--r-- 1 root root    428 2007-10-25 06:20 __init__.pyo
-rwxr-xr-x 1 root root 115280 2007-10-25 06:20 _rpmmodule.so*

and from

/usr/lib/python2.5/site-packages/rpmUtils/:

rw-r--r-- 1 root root  8288 2007-05-16 20:25 arch.py
-rw-r--r-- 1 root root  7353 2007-05-16 20:25 arch.pyc
-rw-r--r-- 1 root root  7353 2007-05-16 20:25 arch.pyo
-rw-r--r-- 1 root root   190 2007-05-16 20:25 __init__.py
-rw-r--r-- 1 root root   618 2007-05-16 20:25 __init__.pyc
-rw-r--r-- 1 root root   618 2007-05-16 20:25 __init__.pyo
-rw-r--r-- 1 root root 11078 2007-05-16 20:25 miscutils.py
-rw-r--r-- 1 root root  9276 2007-05-16 20:25 miscutils.pyc
-rw-r--r-- 1 root root  9235 2007-05-16 20:25 miscutils.pyo
-rw-r--r-- 1 root root 10979 2007-05-16 20:25 oldUtils.py
-rw-r--r-- 1 root root 13119 2007-05-16 20:25 oldUtils.pyc
-rw-r--r-- 1 root root 13119 2007-05-16 20:25 oldUtils.pyo
-rw-r--r-- 1 root root  4659 2007-05-16 20:25 transaction.py
-rw-r--r-- 1 root root  4738 2007-05-16 20:25 transaction.pyc
-rw-r--r-- 1 root root  4738 2007-05-16 20:25 transaction.pyo
-rw-r--r-- 1 root root 28825 2007-05-16 20:25 updates.py
-rw-r--r-- 1 root root 17120 2007-05-16 20:25 updates.pyc
-rw-r--r-- 1 root root 17120 2007-05-16 20:25 updates.pyo