pylint cleaning
svn: r10079
This commit is contained in:
		@@ -256,7 +256,8 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
 | 
			
		||||
            #Preceed with inlaw prefix
 | 
			
		||||
            result[-1] = 'svägerska'
 | 
			
		||||
        if len(result)>1 and len(result) % 2 == 0 and inlaw != '':
 | 
			
		||||
            # Correct string "-2" with genitive s and add a space to get correct Swedish, if even number in result
 | 
			
		||||
            # Correct string "-2" with genitive s and add a space to get
 | 
			
		||||
            # correct Swedish, if even number in result
 | 
			
		||||
            result[-2] = result[-2] + 's '
 | 
			
		||||
        return self.pair_up(result, step)
 | 
			
		||||
 | 
			
		||||
@@ -493,20 +494,6 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
 | 
			
		||||
                rel_str = self._get_ancestors_brother(reltocommon_a, gender_b, step, inlaw)
 | 
			
		||||
            elif gender_b == gen.lib.Person.FEMALE:
 | 
			
		||||
                rel_str = self._get_ancestors_sister(reltocommon_a, step, inlaw)
 | 
			
		||||
            #else:
 | 
			
		||||
                #rel_str = self._get_ancestors_brother(reltocommon_a,gender_b)
 | 
			
		||||
        #elif Ga == 1:
 | 
			
		||||
            # This is taken care of at Ga>Gb and Gb>Ga below
 | 
			
		||||
            # b is niece/nephew of a
 | 
			
		||||
            #if gender_b == gen.lib.Person.MALE:
 | 
			
		||||
            #    rel_str = self._get_nephew(Gb-1, step, inlaw)
 | 
			
		||||
            #elif gender_b == gen.lib.Person.FEMALE:
 | 
			
		||||
            #    rel_str = self._get_niece(Gb-1, step, inlaw)
 | 
			
		||||
            #elif Gb < len(_niece_level) and Gb < len(_nephew_level):
 | 
			
		||||
            #    rel_str = "%s eller %s" % (self._get_nephew(Gb-1, step, inlaw),
 | 
			
		||||
            #                            self._get_niece(Gb-1, step, inlaw))
 | 
			
		||||
            #else:
 | 
			
		||||
            #rel_str = "XXXavlägsen %s-släkting eller %s släkting" % (step,inlaw)
 | 
			
		||||
        elif Ga == Gb:
 | 
			
		||||
            # a and b cousins in the same generation
 | 
			
		||||
            rel_str = self._get_cousin(Ga-1, step, inlaw) 
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user