Ticket #858 (defect)

Hi,

It looks like sometimes one of these two arguments is being built as a list and is throwing an exception when you try to do set operations (|) on them.

Diff below fixing the issue. I'm coercing them both to sets and this handles it.

-Perry

*** /usr/lib/python2.5/site-packages/CherryPy-3.1.0-py2.5.egg/cherrypy/process/plugins.py       2008-09-16 19:44:42.000000000 -0400
--- /usr/lib/python2.5/site-packages/CherryPy-3.1.0-py2.5.egg/cherrypy/process/plugins.py~      2008-09-16 19:42:54.000000000 -0400

***************
*** 443,449 ****
                  k = getattr(m, '__file__', None)
                  sysfiles.add(k)

!         for filename in set(sysfiles) | set(self.files):
              if filename:
                  if filename.endswith('.pyc'):
                      filename = filename[:-1]
--- 443,449 ----
                  k = getattr(m, '__file__', None)
                  sysfiles.add(k)

!         for filename in sysfiles | self.files:
              if filename:
                  if filename.endswith('.pyc'):
                      filename = filename[:-1]