Changeset 10580:c4cbae8dcf8b in orange for Orange/data/io.py


Ignore:
Timestamp:
03/19/12 12:14:20 (2 years ago)
Author:
markotoplak
Branch:
default
rebase_source:
92659cf777626f5bc411357989a821dd2083e466
Message:

Moved deprecation functions, progress bar support and environ into Orange.utils. Orange imports cleanly, although it is not tested yet.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Orange/data/io.py

    r10559 r10580  
    210210    t.setattr("attribute_load_status", attributeLoadStatus) 
    211211    return t 
    212 loadARFF = Orange.misc.deprecated_keywords( 
     212loadARFF = Orange.utils.deprecated_keywords( 
    213213{"createOnNew": "create_on_new"} 
    214214)(loadARFF) 
     
    281281    else: 
    282282        return None 
    283 loadARFF = Orange.misc.deprecated_keywords( 
     283loadARFF = Orange.utils.deprecated_keywords( 
    284284{"createOnNew": "create_on_new"} 
    285285)(loadARFF) 
     
    397397 
    398398 
    399 @Orange.misc.deprecated_keywords({"createOnNew": "create_on_new"}) 
     399@Orange.utils.deprecated_keywords({"createOnNew": "create_on_new"}) 
    400400def loadLibSVM(filename, create_on_new=MakeStatus.Incompatible, **kwargs): 
    401401    """Return class:`Orange.data.Table` containing data from file in LibSVM format""" 
     
    854854register_file_type("libSVM", loadLibSVM, toLibSVM, ".svm") 
    855855 
    856 registerFileType = Orange.misc.deprecated_function_name(register_file_type) 
     856registerFileType = Orange.utils.deprecated_function_name(register_file_type) 
    857857 
    858858#__doc__ +=  \ 
     
    898898    """ 
    899899 
    900     global_settings_dir = Orange.misc.environ.install_dir 
    901     user_settings_dir = Orange.misc.environ.orange_settings_dir 
     900    global_settings_dir = Orange.utils.environ.install_dir 
     901    user_settings_dir = Orange.utils.environ.orange_settings_dir 
    902902    parser = SafeConfigParser() 
    903903    parser.read([os.path.join(global_settings_dir, "orange-search-paths.cfg"), 
     
    919919        path = os.path.pathsep.join(path) 
    920920 
    921     user_settings_dir = Orange.misc.environ.orange_settings_dir 
     921    user_settings_dir = Orange.utils.environ.orange_settings_dir 
    922922    if not os.path.exists(user_settings_dir): 
    923923        try: 
Note: See TracChangeset for help on using the changeset viewer.