Ignore:
Location:
Orange
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed
  • Orange/OrangeCanvas/orngSignalManager.py

    r9671 r9873  
    99 
    1010import orange 
    11 import orngDebugging 
     11from Orange.misc import debugging 
    1212 
    1313Single = 2 
     
    124124    def __init__(self, *args): 
    125125        self.debugFile = None 
    126         self.verbosity = orngDebugging.orngVerbosity 
     126        self.verbosity = debugging.orngVerbosity 
    127127        self.stderr = sys.stderr 
    128128        self._seenExceptions = {} 
     
    130130        self.asyncProcessingEnabled = False 
    131131         
    132         import orngEnviron 
     132        from Orange.misc import environ 
    133133        if not hasattr(self, "log"): 
    134134            SignalManager.log = logging.getLogger("SignalManager") 
    135             self.logFileName = os.path.join(orngEnviron.canvasSettingsDir, "signalManager.log") 
     135            self.logFileName = os.path.join(environ.canvas_settings_dir, 
     136                "signalManager.log") 
    136137            try: 
    137138                self.log.addHandler(logging.handlers.RotatingFileHandler(self.logFileName, maxBytes=2**20, backupCount=2)) 
     
    151152        self.myerr = err() 
    152153             
    153         if orngDebugging.orngDebuggingEnabled: 
    154             self.debugHandler = logging.FileHandler(orngDebugging.orngDebuggingFileName, mode="wb") 
     154        if debugging.orngDebuggingEnabled: 
     155            self.debugHandler = logging.FileHandler(debugging.orngDebuggingFileName, mode="wb") 
    155156            self.log.addHandler(self.debugHandler) 
    156             self.log.setLevel(logging.DEBUG if orngDebugging.orngVerbosity > 0 else logging.INFO)  
     157            self.log.setLevel(logging.DEBUG if debugging.orngVerbosity > 0 
     158            else logging.INFO) 
    157159            sys.excepthook = self.exceptionHandler 
    158160            sys.stderr = self.myerr 
  • Orange/OrangeWidgets/OWBaseWidget.py

    r9671 r9873  
    44# A General Orange Widget, from which all the Orange Widgets are derived 
    55# 
    6 import orngEnviron 
     6from Orange.misc import environ 
     7from Orange.orng.orngEnviron import directoryNames as old_directory_names 
    78from PyQt4.QtCore import * 
    89from PyQt4.QtGui import * 
     
    2021 
    2122from OWContexts import * 
    22 import sys, time, random, user, os, os.path, cPickle, copy, orngMisc 
     23import sys, time, random, user, os, os.path, cPickle, copy 
    2324import orange 
    24 import orngDebugging 
     25from Orange import misc 
     26from Orange.misc import debugging 
    2527from string import * 
    2628from orngSignalManager import * 
     
    147149 
    148150        # directories are better defined this way, otherwise .ini files get written in many places 
    149         self.__dict__.update(orngEnviron.directoryNames) 
     151        self.__dict__.update(old_directory_names) 
    150152        try: 
    151153            self.__dict__["thisWidgetDir"] = os.path.dirname(sys.modules[self.__class__.__module__].__file__) 
     
    848850    def getWidgetStateIcons(cls): 
    849851        if not hasattr(cls, "_cached__widget_state_icons"): 
    850             iconsDir = os.path.join(orngEnviron.canvasDir, "icons") 
    851             QDir.addSearchPath("canvasIcons",os.path.join(orngEnviron.canvasDir, "icons/")) 
     852            iconsDir = os.path.join(environ.canvas_install_dir, "icons") 
     853            QDir.addSearchPath("canvasIcons",os.path.join(environ.canvas_install_dir, 
     854                "icons/")) 
    852855            info = QPixmap("canvasIcons:information.png") 
    853856            warning = QPixmap("canvasIcons:warning.png") 
  • Orange/OrangeWidgets/OWGUI.py

    r9671 r9873  
    20832083        self.widget.progressBarFinished() 
    20842084         
    2085 from orngMisc import progressBarMilestones 
     2085from Orange.misc import progress_bar_milestones as progressBarMilestones 
    20862086 
    20872087############################################################################## 
  • Orange/OrangeWidgets/OWReport.py

    r9671 r9873  
    2323from PyQt4.QtWebKit import * 
    2424 
     25from Orange.misc import environ 
     26 
    2527import os, time, tempfile, shutil, re, shutil, pickle, binascii 
    2628import xml.dom.minidom 
     
    4850     
    4951class ReportWindow(OWWidget): 
    50     indexfile = os.path.join(orngEnviron.widgetDir, "report", "index.html") 
     52    indexfile = os.path.join(environ.widget_install_dir, "report", "index.html") 
    5153     
    5254    def __init__(self): 
  • Orange/testing/regression/xtest.py

    r9751 r9873  
    33import os, re, sys, time, subprocess 
    44import getopt 
    5 import orngEnviron 
     5from Orange.misc import environ 
    66 
    77regtestdir = os.getcwd().replace("\\", "/") 
     
    184184    module = opts.get("--module", "all") 
    185185    if module in ["all"]: 
    186         root = "%s/.." % orngEnviron.orangeDir 
     186        root = "%s/.." % environ.install_dir 
    187187        module = "orange" 
    188188        dirs = [("modules", "Orange/doc/modules"), 
     
    191191                ("orange25", "docs/reference/rst/code")] 
    192192    elif module in ["orange"]: 
    193         root = "%s/.." % orngEnviron.orangeDir 
     193        root = "%s/.." % environ.install_dir 
    194194        module = "orange" 
    195195        dirs = [("modules", "Orange/doc/modules"), 
     
    197197                ("ofb", "docs/tutorial/rst/code")] 
    198198    elif module in ["ofb-rst"]: 
    199         root = "%s/.." % orngEnviron.orangeDir 
     199        root = "%s/.." % environ.install_dir 
    200200        module = "orange" 
    201201        dirs = [("ofb", "docs/tutorial/rst/code")] 
    202202    elif module in ["orange25"]: 
    203         root = "%s/.." % orngEnviron.orangeDir 
     203        root = "%s/.." % environ.install_dir 
    204204        module = "orange" 
    205205        dirs = [("orange25", "docs/reference/rst/code")] 
    206206    elif module == "obi": 
    207         root = orngEnviron.addOnsDirSys + "/Bioinformatics/doc" 
     207        root = environ.add_ons_dir + "/Bioinformatics/doc" 
    208208        dirs = [("modules", "modules")] 
    209209    elif module == "text": 
    210         root = orngEnviron.addOnsDirSys + "/Text/doc" 
     210        root = environ.add_ons_dir + "/Text/doc" 
    211211        dirs = [("modules", "modules")] 
    212212    else: 
Note: See TracChangeset for help on using the changeset viewer.