Changeset 1200

Show
Ignore:
Timestamp:
04/14/08 19:54:19 (2 years ago)
Author:
nick
Message:

Merged source:pyamf/branches/adapter-pep-302-250. Fixes #250

Location:
pyamf/trunk
Files:
1 removed
2 modified
3 copied

Legend:

Unmodified
Added
Removed

  • pyamf/trunk/pyamf/adapters/__init__.py

    r1064 r1200  
    1111""" 
    1212 
    13 import os.path, glob, imp 
     13import os.path, glob 
    1414 
    15 from peak.util import imports 
     15from pyamf.util import imports 
    1616 
    1717class PackageImporter(object): 
    … …  
    4646 
    4747        try: 
    48             imp.find_module(mod[1:]) 
     48            imports.find_module(mod[1:]) 
    4949        except ImportError: 
    5050            continue 

  • pyamf/trunk/setup.py

    r1194 r1200  
    2929import sys 
    3030 
    31 install_requires = ["fpconst>=0.7.2", "Importing>=1.9.2"] 
     31install_requires = ["fpconst>=0.7.2"] 
    3232if sys.version_info < (2, 5): 
    3333    install_requires.extend(["elementtree >= 1.2.6", "uuid>=1.30"])