Changeset 1601:d3a65a71731e in orange-bioinformatics


Ignore:
Timestamp:
03/20/12 13:30:59 (2 years ago)
Author:
markotoplak
Branch:
default
rebase_source:
7abb25b27abdf925061ec8258c82b2839f639d59
Message:

Fixes supporting the move of (most of) Orange.misc to Orange.utils.

Files:
11 edited

Legend:

Unmodified
Added
Removed
  • obiGeneAtlas.py

    r1500 r1601  
    2020from collections import defaultdict, namedtuple 
    2121 
    22 from Orange.misc import serverfiles 
     22from Orange.utils import serverfiles 
    2323 
    2424GeneResults = namedtuple("GeneResults", "id name synonyms expressions") 
     
    134134    return matcher 
    135135 
    136 from Orange.misc import lru_cache 
     136from Orange.utils import lru_cache 
    137137 
    138138@lru_cache(maxsize=3) 
  • obiGeneMania.py

    r1528 r1601  
    478478     
    479479    if progress == True: 
    480         from Orange.misc import ConsoleProgressBar 
     480        from Orange.utils import ConsoleProgressBar 
    481481        progress = ConsoleProgressBar("Downloading %r." % basename) 
    482482        with finishing(progress): 
     
    493493from collections import namedtuple 
    494494from operator import itemgetter 
    495 from Orange.misc import lru_cache 
     495from Orange.utils import lru_cache 
    496496 
    497497GENE_MANIA_INTERACTION_FIELDS = \ 
  • obiGeneSetSig.py

    r1600 r1601  
    11import Orange 
    2 import Orange.misc 
     2import Orange.utils 
    33import obiGeneSets 
    44import obiGene 
     
    7272class GeneSetTrans(object): 
    7373 
    74     __new__ = Orange.misc._orange__new__(object) 
     74    __new__ = Orange.utils._orange__new__(object) 
    7575 
    7676    def _mat_ni(self, data): 
  • obiKEGG2/__init__.py

    r1552 r1601  
    1818from datetime import datetime 
    1919 
    20 from Orange.misc import lru_cache, serverfiles 
     20from Orange.utils import lru_cache, serverfiles 
    2121 
    2222from . import databases 
     
    4444 
    4545import obiProb 
    46 from Orange.misc import deprecated_keywords, deprecated_attribute 
     46from Orange.utils import deprecated_keywords, deprecated_attribute 
    4747 
    4848class Organism(object): 
     
    256256 
    257257import obiGene 
    258 from Orange.misc import serverfiles 
    259 from Orange.misc import ConsoleProgressBar 
     258from Orange.utils import ConsoleProgressBar 
    260259 
    261260class MatcherAliasesKEGG(obiGene.MatcherAliasesPickled): 
  • obiKEGG2/api.py

    r1544 r1601  
    333333    # TODO: move a copy of lru_cache in .caching if distributing this as a 
    334334    # standalone package 
    335     from Orange.misc import lru_cache 
     335    from Orange.utils import lru_cache 
    336336 
    337337     
  • obiKEGG2/brite.py

    r1532 r1601  
    99import urllib2 
    1010 
    11 from Orange.misc import deprecated_attribute 
     11from Orange.utils import deprecated_attribute 
    1212 
    1313from . import conf 
  • obiKEGG2/conf.py

    r1580 r1601  
    99import ConfigParser 
    1010from StringIO import StringIO 
    11 from Orange.misc import serverfiles 
     11from Orange.utils import serverfiles 
    1212kegg_dir = serverfiles.localpath("KEGG2") 
    1313 
  • obiKEGG2/pathway.py

    r1543 r1601  
    1717from . import caching 
    1818 
    19 from Orange.misc import deprecated_attribute 
     19from Orange.utils import deprecated_attribute 
    2020     
    2121def cached_method(func, cache_name="_cached_method_cache", store=None): 
  • obiPPI.py

    r1517 r1601  
    2121from obiTaxonomy import pickled_cache 
    2222 
    23 from Orange.misc import lru_cache, ConsoleProgressBar 
     23from Orange.utils import lru_cache 
     24from Orange.utils import ConsoleProgressBar 
    2425 
    2526import sqlite3 
  • widgets/OWGEODatasets.py

    r1460 r1601  
    7979        self._header[orientation][section][role] = value 
    8080         
    81 from Orange.misc import lru_cache 
     81from Orange.utils import lru_cache 
    8282 
    8383class MySortFilterProxyModel(QSortFilterProxyModel):     
  • widgets/prototypes/OWGeneAtlasTissueExpression.py

    r1555 r1601  
    1111 
    1212from collections import defaultdict 
    13 from Orange.misc import lru_cache 
     13from Orange.utils import lru_cache 
    1414 
    1515import orngDataCaching 
Note: See TracChangeset for help on using the changeset viewer.