Only python2.7 tests were passing. This will fix all tests for python2.6, python3.3, and pep8. Change-Id: I067d4194774d7e2cf2970c49febe52643d7ac21d
		
			
				
	
	
		
			40 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			40 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
#   Licensed under the Apache License, Version 2.0 (the "License"); you may
 | 
						|
#   not use this file except in compliance with the License. You may obtain
 | 
						|
#   a copy of the License at
 | 
						|
#
 | 
						|
#        http://www.apache.org/licenses/LICENSE-2.0
 | 
						|
#
 | 
						|
#   Unless required by applicable law or agreed to in writing, software
 | 
						|
#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 | 
						|
#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 | 
						|
#   License for the specific language governing permissions and limitations
 | 
						|
#   under the License.
 | 
						|
#
 | 
						|
"""General utilities."""
 | 
						|
 | 
						|
import logging
 | 
						|
import sys
 | 
						|
 | 
						|
LOG = logging.getLogger(__name__)
 | 
						|
 | 
						|
 | 
						|
def import_class(import_str):
 | 
						|
    """Return a class from a string including module and class."""
 | 
						|
    mod_str, _, class_str = import_str.rpartition('.')
 | 
						|
    try:
 | 
						|
        __import__(mod_str)
 | 
						|
        return getattr(sys.modules[mod_str], class_str)
 | 
						|
    except (ImportError, ValueError, AttributeError) as exc:
 | 
						|
        LOG.debug('Inner Exception: %s', exc)
 | 
						|
        raise
 | 
						|
 | 
						|
 | 
						|
def import_object(import_str, *args, **kw):
 | 
						|
    """Return an object including a module or module and class."""
 | 
						|
    try:
 | 
						|
        __import__(import_str)
 | 
						|
        return sys.modules[import_str]
 | 
						|
    except ImportError:
 | 
						|
        cls = import_class(import_str)
 | 
						|
        return cls(*args, **kw)
 |