Changeset 11290:fff4c45473e8 in orange


Ignore:
Timestamp:
01/29/13 16:28:17 (15 months ago)
Author:
janezd <janez.demsar@…>
Branch:
default
Parents:
11289:4f67585127bc (diff), 11288:4e6cc71ae208 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge

Location:
Orange
Files:
1085 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • Orange/OrangeCanvas/registry/description.py

    r11289 r11290  
    9696        self.flags = flags 
    9797 
     98    def __str__(self): 
     99        fmt = ("{0.__name__}(name={name!r}, type={type!s}, " 
     100               "handler={handler}, ...)") 
     101        return fmt.format(type(self), **self.__dict__) 
     102 
    98103 
    99104def input_channel_from_args(args): 
     
    105110        return args 
    106111    else: 
    107         raise TypeError 
     112        raise TypeError("tuple, dict or InputSignal expected " 
     113                        "(got {0!r})".format(type(args))) 
    108114 
    109115 
     
    156162                ) 
    157163 
     164    def __str__(self): 
     165        fmt = ("{0.__name__}(name={name!r}, type={type!s}, " 
     166               "...)") 
     167        return fmt.format(type(self), **self.__dict__) 
     168 
    158169 
    159170def output_channel_from_args(args): 
     
    165176        return args 
    166177    else: 
    167         raise TypeError 
     178        raise TypeError("tuple, dict or OutputSignal expected " 
     179                        "(got {0!r})".format(type(args))) 
    168180 
    169181 
     
    336348             icon=meta.icon, 
    337349             priority=int(meta.priority) 
    338             ) 
     350        ) 
     351 
    339352        return desc 
    340353 
Note: See TracChangeset for help on using the changeset viewer.