Changeset 3053

Show
Ignore:
Timestamp:
02/13/08 17:54:28 (10 months ago)
Author:
bgranger
Message:

Changed the naming conventions in most public interfaces from lowerCamelCase to lowercase_with_underscores. In the future all new code should use lowercase_with_underscores. There are parts of ipython1 that still use the older conventions and these should be changed eventually. But, I think I got all public interfaces for now. Whew.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • ipython1/branches/ipython1-client-r3021/README

    r2820 r3053  
    155155Now you can see what engines are registered with the controller:: 
    156156 
    157     >>> rc.getIDs() 
     157    >>> rc.get_ids() 
    158158    [0,1,2,3] 
    159159 

  • ipython1/branches/ipython1-client-r3021/docs/ChangeLog

    r3021 r3053  
    66    only have one implementation (and always will). 
    77 
    8     * ipython1.kernel: Created new pushFunction/pullFunctions in the API 
     8    * ipython1.kernel: Created new push_function/pull_functions in the API 
    99    of the engines.  These functions now have all the needed logic for 
    1010    pushing/pulling functions.  The logic has been removed from regular 
    …… 
    3232    methods have been adapted to take functions now.  This approach 
    3333    doesn't work for classes that are callable though.  Still need 
    34     to add tests of how push/pullSerialized handle this. 
     34    to add tests of how push/pull_serialized handle this. 
    3535 
    3636 
    …… 
    4848 
    4949    * ipython1.kernel.task.py: Created a new TaskResult object 
    50     that is returned when getTaskResult is called.  This new  
     50    that is returned when get_task_result is called.  This new  
    5151    object provide a much simpler and intuitive way of accessing 
    5252    the results of a task.  The variables that are pulled back 
    5353    are available as attributes of the TaskResult object.  There 
    54     are also engineID, taskID attributes.  Failures are handled  
     54    are also engineid, taskid attributes.  Failures are handled  
    5555    through a failure attribute, but remote exceptions can also 
    5656    be reraised by calling the raiseException method. 
    5757     
    5858    * ipython1.kernel.taskclient/taskxmlrpc.py:  Minor changes to reflect 
    59     new TaskResult object that is returned by getTaskResult. 
     59    new TaskResult object that is returned by get_task_result. 
    6060     
    6161    * doc/examples: Updated TaskController examples to use new 
    …… 
    7272    actually raise any exceptions that it gets.  Made sure that 
    7373    SyntaxError/IndentationError is raised upon compilation.  Added 
    74     reset and getResult.  All the changes in core should eventually 
     74    reset and get_result.  All the changes in core should eventually 
    7575    be merged in with core1. 
    7676     
    …… 
    8484     
    8585    * ipython1.test: updated tests to work with the new core.   
    86     Added a new testgenerator.py to make writing tests easier. 
     86    Added a new tgenerator.py to make writing tests easier. 
    8787 
    8888 
    …… 
    9898    * ipython1.kernel.multiengineclient.py:  Got rid of ifoo methods 
    9999    and replaced them by types with custom __repr__ methods.  ipull 
    100     is now zipPull.  Got rid of slicing and indexing notation in  
     100    is now zip_pull.  Got rid of slicing and indexing notation in  
    101101    client class.  It led to an API that was simply too complex. 
    102102 

  • ipython1/branches/ipython1-client-r3021/docs/examples/DistributedHelloWorld.py

    r3043 r3053  
    99 
    1010mec.execute('import time') 
    11 helloTaskId = tc.run(client.Task('time.sleep(3) ; word = "Hello,"', resultNames=['word'])) 
    12 worldTaskId = tc.run(client.Task('time.sleep(3) ; word = "World!"', resultNames=['word'])) 
     11helloTaskId = tc.run(client.Task('time.sleep(3) ; word = "Hello,"', pull=['word'])) 
     12worldTaskId = tc.run(client.Task('time.sleep(3) ; word = "World!"', pull=['word'])) 
    1313 
    14 print tc.getTaskResult(helloTaskId).ns.word, tc.getTaskResult(worldTaskId).ns.word 
     14print tc.get_task_result(helloTaskId).ns.word, tc.get_task_result(worldTaskId).ns.word 

  • ipython1/branches/ipython1-client-r3021/docs/examples/PBHelloWorld.py

    r2305 r3053  
    1919def connected(perspective): 
    2020    client = PBTaskClient(perspective) 
    21     client.run(kernel.Task('x = "hello"', resultNames=['x'])).addCallbacks(success, failure) 
    22     client.run(kernel.Task('raise ValueError, "pants"', resultNames=['x'])).addCallbacks(success, failure) 
     21    client.run(kernel.Task('x = "hello"', pull=['x'])).addCallbacks(success, failure) 
     22    client.run(kernel.Task('raise ValueError, "pants"', pull=['x'])).addCallbacks(success, failure) 
    2323    print "connected." 
    2424 

  • ipython1/branches/ipython1-client-r3021/docs/examples/fetchparse.py

    r3043 r3053  
    5454            if url.startswith(self.site): 
    5555                print '    ', url 
    56                 self.linksWorking[url] = self.tc.run(client.Task('links = fetchAndParse(url)', resultNames=['links'], setupNS={'url': url})) 
     56                self.linksWorking[url] = self.tc.run(client.Task('links = fetchAndParse(url)', pull=['links'], push={'url': url})) 
    5757         
    5858    def onVisitDone(self, result, url): 
    …… 
    7777    def synchronize(self): 
    7878        for url, taskId in self.linksWorking.items(): 
    79             # Calling getTaskResult with block=False will return None if the 
     79            # Calling get_task_result with block=False will return None if the 
    8080            # task is not done yet.  This provides a simple way of polling. 
    81             result = self.tc.getTaskResult(taskId, block=False) 
     81            result = self.tc.get_task_result(taskId, block=False) 
    8282            if result is not None: 
    8383                self.onVisitDone(result, url) 

  • ipython1/branches/ipython1-client-r3021/docs/examples/mcdriver.py

    r3043 r3053  
    2828 
    2929# Submit tasks 
    30 taskIDs = [] 
     30taskids = [] 
    3131for K in K_vals: 
    3232    for sigma in sigma_vals: 
    3333        t = client.Task(task_string,  
    34             setupNS=dict(sigma=sigma,K=K), 
    35             resultNames=['vp','ap','vc','ac','sigma','K']) 
    36         taskIDs.append(tc.run(t)) 
     34            push=dict(sigma=sigma,K=K), 
     35            pull=['vp','ap','vc','ac','sigma','K']) 
     36        taskids.append(tc.run(t)) 
    3737 
    38 print "Submitted tasks: ", taskIDs 
     38print "Submitted tasks: ", taskids 
    3939 
    4040# Block until tasks are completed 
    41 tc.barrier(taskIDs) 
     41tc.barrier(taskids) 
    4242 
    4343# Get the results 
    44 results = [tc.getTaskResult(tid) for tid in taskIDs] 
     44results = [tc.get_task_result(tid) for tid in taskids] 
    4545 
    4646# Assemble the result 

  • ipython1/branches/ipython1-client-r3021/docs/examples/multiengine.ipy

    r3049 r3053  
    1818mec.activate() 
    1919mec.block = True 
    20 mec.getIDs() 
     20mec.get_ids() 
    2121n = len(mec) 
    2222assert n >= 4, "Not Enough Engines: %i, 4 needed for this script"%n 
    …… 
    4747mec.execute('print a') 
    4848 
    49 for id in mec.getIDs(): 
     49for id in mec.get_ids(): 
    5050    mec.execute('b=%d' % id, targets=id) 
    5151 
    …… 
    9292mec.push(dict(a=10, b=30, c={'f':range(10)})) 
    9393mec.pull(('a', 'b')) 
    94 mec.zipPull(('a', 'b')) 
    95  
    96 for id in mec.getIDs(): 
     94mec.zip_pull(('a', 'b')) 
     95 
     96for id in mec.get_ids(): 
    9797    mec.push(dict(a=id), targets=id) 
    9898 
    9999 
    100 for id in mec.getIDs(): 
     100for id in mec.get_ids(): 
    101101    mec.pull('a', targets=id) 
    102102 
    …… 
    108108mec['a'] 
    109109 
    110 # getResult/reset/keys 
    111  
    112 mec.getResult() 
     110# get_result/reset/keys 
     111 
     112mec.get_result() 
    113113%result 
    114114mec.keys() 
    …… 
    123123 
    124124%px a = 5 
    125 mec.getResult(1) 
     125mec.get_result(1) 
    126126mec.keys() 
    127127 
    …… 
    132132 
    133133 
    134 mec.queueStatus() 
     134mec.queue_status() 
    135135time.sleep(3.0) 
    136 mec.clearQueue() 
    137 mec.queueStatus() 
     136mec.clear_queue() 
     137mec.queue_status() 
    138138time.sleep(2.0) 
    139 mec.queueStatus() 
     139mec.queue_status() 
    140140 
    141141mec.barrier(prs) 
    …… 
    195195 
    196196pr1 = mec.push(dict(a=10)) 
    197 pr1.getResult() 
     197pr1.get_result() 
    198198pr2 = mec.pull('a') 
    199199pr2.r 
    …… 
    207207 
    208208try: 
    209     pd1.getResult() 
     209    pd1.get_result() 
    210210except InvalidDeferredID: 
    211211    print "PendingResult object was cleared OK." 
    …… 
    213213 
    214214try: 
    215     pd2.getResult() 
     215    pd2.get_result() 
    216216except InvalidDeferredID: 
    217217    print "PendingResult object was cleared OK." 

  • ipython1/branches/ipython1-client-r3021/docs/examples/nwmerge.py

    r3043 r3053  
    8888    from ipython1.kernel import client 
    8989    ipc = client.RemoteController(('127.0.0.1',10105)) 
    90     print 'Engine IDs:',ipc.getIDs() 
     90    print 'Engine IDs:',ipc.get_ids() 
    9191 
    9292    # Make a set of 'sorted datasets' 

  • ipython1/branches/ipython1-client-r3021/docs/examples/parallel_pylab.ipy

    r3043 r3053  
    2525# Get an IPython1 client 
    2626rc = client.MultiEngineController(('127.0.0.1',10105)) 
    27 rc.getIDs() 
     27rc.get_ids() 
    2828rc.activate() 
    2929 

  • ipython1/branches/ipython1-client-r3021/docs/examples/plotting_frontend.py

    r3043 r3053  
    2323# Get an IPython1 client 
    2424rc = client.RemoteController(('127.0.0.1',10105)) 
    25 rc.getIDs() 
     25rc.get_ids() 
    2626 
    2727# Run the simulation on all the engines 

  • ipython1/branches/ipython1-client-r3021/docs/examples/rmt.ipy

    r3043 r3053  
    2929 
    3030def parallelDiffs(rc, num, N): 
    31     nengines = len(rc.getIDs()) 
     31    nengines = len(rc.get_ids()) 
    3232    num_per_engine = num/nengines 
    3333    print "Running with", num_per_engine, "per engine." 

  • ipython1/branches/ipython1-client-r3021/docs/examples/task1.py

    r3043 r3053  
    1212""" 
    1313 
    14 t1 = client.Task(cmd1, clearBefore=False, clearAfter=True, resultNames=['a','b','c']) 
     14t1 = client.Task(cmd1, clear_before=False, clear_after=True, pull=['a','b','c']) 
    1515tid1 = tc.run(t1) 
    16 tr1 = tc.getTaskResult(tid1,block=True) 
     16tr1 = tc.get_task_result(tid1,block=True) 
    1717tr1.raiseException() 
    1818print "a, b: ", tr1.ns.a, tr1.ns.b 

  • ipython1/branches/ipython1-client-r3021/docs/examples/task_profiler.py

    r3046 r3053  
    5151     
    5252    rc.block=True 
    53     nengines = len(rc.getIDs()) 
     53    nengines = len(rc.get_ids()) 
    5454    rc.execute('from IPython.genutils import time') 
    5555 
    …… 
    6262    time.sleep(1) 
    6363    start = time.time() 
    64     taskIDs = [tc.run(t) for t in tasks] 
    65     tc.barrier(taskIDs) 
     64    taskids = [tc.run(t) for t in tasks] 
     65    tc.barrier(taskids) 
    6666    stop = time.time() 
    6767 

  • ipython1/branches/ipython1-client-r3021/docs/tutorial/sec1.ipy

    r2305 r3053  
    55import ipython1.kernel.api as kernel 
    66rc = kernel.RemoteController(('127.0.0.1',10105)) 
    7 rc.getIDs()                                         # get the IDs of the available engines 
     7rc.get_ids()                                         # get the IDs of the available engines 
    88rc.resetAll()                                       # REMOVE 
    99 
    …… 
    2626rc.executeAll('import time')                        # blocking  
    2727pr = rc.executeAll('time.sleep(5)',block=False)    # non-blocking, returns a PendingResult object 
    28 pr.getResult()                                      # now block for the result 
     28pr.get_result()                                      # now block for the result 
    2929pr = rc.executeAll('time.sleep(5)', block=False) 
    30 pr.getResult(block=False)                           # See if result is ready but don't block 
    31 pr.r                                                # Shorthand for getResult(block=True) 
     30pr.get_result(block=False)                           # See if result is ready but don't block 
     31pr.r                                                # Shorthand for get_result(block=True) 
    3232rc.block = False                                    # now commands won't block by default 
    3333rc.executeAll('y = [x**4 for x in xrange(1000)]')   # non-blocking 

  • ipython1/branches/ipython1-client-r3021/ipython1/config/api.py

    r2866 r3053  
    1414 
    1515import os 
    16 from ipython1.config.cutils import getHomeDir, getIpythonDir 
     16from ipython1.config.cutils import get_home_dir, get_ipython_dir 
    1717from ipython1.external.configobj import ConfigObj 
    1818 
    …… 
    2323        self.current.indent_type = '    ' 
    2424        self.filename = filename 
    25         self.writeDefaultConfigFile() 
     25        self.write_default_config_file() 
    2626         
    27     def getConfigObj(self): 
     27    def get_config_obj(self): 
    2828        return self.current 
    2929     
    30     def updateConfigObj(self, newConfig): 
     30    def update_config_obj(self, newConfig): 
    3131        self.current.merge(newConfig) 
    3232         
    33     def updateConfigObjFromFile(self, filename): 
     33    def update_config_obj_from_file(self, filename): 
    3434        newConfig = ConfigObj(filename, file_error=False) 
    3535        self.current.merge(newConfig) 
    3636         
    37     def updateConfigObjFromDefaultFile(self, ipythondir=None): 
    38         fname = self.resolveFilePath(self.filename, ipythondir) 
    39         self.updateConfigObjFromFile(fname) 
     37    def update_config_obj_from_default_file(self, ipythondir=None): 
     38        fname = self.resolve_file_path(self.filename, ipythondir) 
     39        self.update_config_obj_from_file(fname) 
    4040 
    41     def writeConfigObjToFile(self, filename): 
     41    def write_config_obj_to_file(self, filename): 
    4242        f = open(filename, 'w') 
    4343        self.current.write(f) 
    4444        f.close() 
    4545 
    46     def writeDefaultConfigFile(self): 
    47         ipdir = getIpythonDir() 
     46    def write_default_config_file(self): 
     47        ipdir = get_ipython_dir() 
    4848        fname = ipdir + '/' + self.filename 
    4949        if not os.path.isfile(fname): 
    5050            print "Writing the configuration file to: " + fname 
    51             self.writeConfigObjToFile(fname) 
     51            self.write_config_obj_to_file(fname) 
    5252     
    5353    def _import(self, key): 
    …… 
    5959        return temp   
    6060 
    61     def resolveFilePath(self, filename, ipythondir = None): 
     61    def resolve_file_path(self, filename, ipythondir = None): 
    6262        """Resolve filenames into absolute paths. 
    6363 
    …… 
    8484                return trythis         
    8585 
    86         trythis = getIpythonDir() + '/' + filename 
     86        trythis = get_ipython_dir() + '/' + filename 
    8787        if os.path.isfile(trythis): 
    8888            return trythis 

  • ipython1/branches/ipython1-client-r3021/ipython1/config/cutils.py

    r2786 r3053  
    2727    pass 
    2828 
    29 def getHomeDir(): 
     29def get_home_dir(): 
    3030    """Return the closest possible equivalent to a 'home' directory. 
    3131 
    …… 
    8282            raise HomeDirError,'support for your operating system not implemented.' 
    8383 
    84 def getIpythonDir(): 
     84def get_ipython_dir(): 
    8585    ipdir_def = '.ipython' 
    86     home_dir = getHomeDir() 
     86    home_dir = get_home_dir() 
    8787    ipdir = os.path.abspath(os.environ.get('IPYTHONDIR', 
    8888                                           os.path.join(home_dir,ipdir_def))) 

  • ipython1/branches/ipython1-client-r3021/ipython1/core/interpreter.py

    r3036 r3053  
    441441        self.user_ns.update(ns) 
    442442 
    443     def pushFunction(self, ns): 
     443    def push_function(self, ns): 
    444444        # First set the func_globals for all functions to self.user_ns 
    445445        new_kwds = {} 
    …… 
    545545        return result 
    546546 
    547     def pullFunction(self, keys): 
     547    def pull_function(self, keys): 
    548548        return self.pull(keys) 
    549549 

  • ipython1/branches/ipython1-client-r3021/ipython1/external/twisted/web2/dav/fileop.py

    r2063 r3053  
    205205        yield response 
    206206        try: 
    207             response = response.getResult() 
     207            response = response.get_result() 
    208208        finally: 
    209209            source_stream.close() 
    …… 
    220220            response = waitForDeferred(delete(destination_uri, destination_filepath)) 
    221221            yield response 
    222             response = response.getResult() 
     222            response = response.get_result() 
    223223            checkResponse(response, "delete", responsecode.NO_CONTENT) 
    224224            success_code = responsecode.NO_CONTENT 
    …… 
    287287                    response = waitForDeferred(copy(FilePath(source_path), FilePath(destination_path), destination_uri, depth)) 
    288288                    yield response 
    289                     response = response.getResult() 
     289                    response = response.get_result() 
    290290                    checkResponse(response, "copy", responsecode.NO_CONTENT) 
    291291 
    …… 
    358358        response = waitForDeferred(delete(destination_uri, destination_filepath)) 
    359359        yield response 
    360         response = response.getResult() 
     360        response = response.get_result() 
    361361        checkResponse(response, "delete", responsecode.NO_CONTENT) 
    362362 
    …… 
    384384    response = waitForDeferred(copy(source_filepath, destination_filepath, destination_uri, depth)) 
    385385    yield response 
    386     response = response.getResult() 
     386    response = response.get_result() 
    387387    checkResponse(response, "copy", responsecode.CREATED, responsecode.NO_CONTENT) 
    388388 
    389389    response = waitForDeferred(delete(source_uri, source_filepath)) 
    390390    yield response 
    391     response = response.getResult() 
     391    response = response.get_result() 
    392392    checkResponse(response, "delete", responsecode.NO_CONTENT) 
    393393 
    …… 
    435435            response = waitForDeferred(delete(uri, filepath)) 
    436436            yield response 
    437             response = response.getResult() 
     437            response = response.get_result() 
    438438            checkResponse(response, "delete", responsecode.NO_CONTENT) 
    439439 
    …… 
    457457        x = waitForDeferred(readIntoFile(stream, resource_file)) 
    458458        yield x 
    459         x.getResult() 
     459        x.get_result() 
    460460    except: 
    461461        raise HTTPError(statusForFailure( 

  • ipython1/branches/ipython1-client-r3021/ipython1/external/twisted/web2/dav/method/mkcol.py

    r2063 r3053  
    4343    parent = waitForDeferred(request.locateResource(parentForURL(request.uri))) 
    4444    yield parent 
    45     parent = parent.getResult() 
     45    parent = parent.get_result() 
    4646 
    4747    if self.fp.exists(): 
    …… 
    7272    yield x 
    7373    try: 
    74         x.getResult() 
     74        x.get_result() 
    7575    except ValueError, e: 
    7676        log.err("Error while handling MKCOL body: %s" % (e,)) 
    …… 
    7979    response = waitForDeferred(mkcollection(self.fp)) 
    8080    yield response 
    81     yield response.getResult() 
     81    yield response.get_result() 
    8282 
    8383http_MKCOL = deferredGenerator(http_MKCOL) 

  • ipython1/branches/ipython1-client-r3021/ipython1/external/twisted/web2/dav/method/propfind.py

    r2063 r3053  
    5454        doc = waitForDeferred(davXMLFromStream(request.stream)) 
    5555        yield doc 
    56         doc = doc.getResult() 
     56        doc = doc.get_result() 
    5757    except ValueError, e: 
    5858        log.err("Error while handling PROPFIND body: %s" % (e,)) 
    …… 
    108108        resource_properties = waitForDeferred(resource.listProperties(request)) 
    109109        yield resource_properties 
    110         resource_properties = resource_properties.getResult() 
     110        resource_properties = resource_properties.get_result() 
    111111 
    112112        if search_properties is "names": 
    …… 
    123123                properties_to_enumerate = waitForDeferred(resource.listAllprop(request)) 
    124124                yield properties_to_enumerate 
    125                 properties_to_enumerate = properties_to_enumerate.getResult() 
     125                properties_to_enumerate = properties_to_enumerate.get_result() 
    126126            else: 
    127127                properties_to_enumerate = search_properties 
    …… 
    132132                        resource_property = waitForDeferred(resource.readProperty(property, request)) 
    133133                        yield resource_property 
    134                         resource_property = resource_property.getResult() 
     134                        resource_property = resource_property.get_result() 
    135135                    except: 
    136136                        f = Failure() 

  • ipython1/branches/ipython1-client-r3021/ipython1/external/twisted/web2/dav/method/proppatch.py

    r2063 r3053  
    5353        doc = waitForDeferred(davXMLFromStream(request.stream)) 
    5454        yield doc 
    55         doc = doc.getResult() 
     55        doc = doc.get_result() 
    5656    except ValueError, e: 
    5757        log.err("Error while handling PROPPATCH body: %s" % (e,)) 
    …… 
    9797                has = waitForDeferred(self.hasProperty(property, request)) 
    9898                yield has 
    99                 has = has.getResult() 
     99                has = has.get_result() 
    100100 
    101101                if has: 
    102102                    oldProperty = waitForDeferred(self.readProperty(property, request)) 
    103103                    yield oldProperty 
    104                     oldProperty.getResult() 
     104                    oldProperty.get_result() 
    105105 
    106106                    def undo(): 
    …… 
    113113                    x = waitForDeferred(action(property, request)) 
    114114                    yield x 
    115                     x.getResult() 
     115                    x.get_result() 
    116116                except ValueError, e: 
    117117                    # Convert ValueError exception into HTTPError 
    …… 
    141141                    ok = waitForDeferred(do(self.writeProperty, property)) 
    142142                    yield ok 
    143                     ok = ok.getResult() 
     143                    ok = ok.get_result() 
    144144                    if not ok: 
    145145                        gotError = True 
    …… 
    148148                    ok = waitForDeferred(do(self.removeProperty, property)) 
    149149                    yield ok 
    150                     ok = ok.getResult() 
     150                    ok = ok.get_result() 
    151151                    if not ok: 
    152152                        gotError = True 
    …… 
    164164            x = waitForDeferred(action()) 
    165165            yield x 
    166             x.getResult() 
     166            x.get_result() 
    167167        raise 
    168168 
    …… 
    175175            x = waitForDeferred(action()) 
    176176            yield x 
    177             x.getResult() 
     177            x.get_result() 
    178178        responses.error() 
    179179 

  • ipython1/branches/ipython1-client-r3021/ipython1/external/twisted/web2/dav/method/report.py

    r2063 r3053  
    5454        doc = waitForDeferred(davXMLFromStream(request.stream)) 
    5555        yield doc 
    56         doc = doc.getResult() 
     56        doc = doc.get_result() 
    5757    except ValueError, e: 
    5858        log.err("Error while handling REPORT body: %s" % (e,)) 

  • ipython1/branches/ipython1-client-r3021/ipython1/external/twisted/web2/dav/method/report_expand.py

    r2063 r3053  
    6262            all_properties = waitForDeferred(self.listAllProp(request)) 
    6363            yield all_properties 
    64             all_properties = all_properties.getResult() 
     64            all_properties = all_properties.get_result() 
    6565 
    6666            for all_property in all_properties: 
    …… 
    8080        my_properties = waitForDeferred(self.listProperties(request)) 
    8181        yield my_properties 
    82         my_properties = my_properties.getResult() 
     82        my_properties = my_properties.get_result() 
    8383 
    8484        if property in my_properties: 
    …… 
    8686                value = waitForDeferred(self.readProperty(property, request)) 
    8787                yield value 
    88                 value = value.getResult() 
     88                value = value.get_result() 
    8989 
    9090                if isinstance(value, davxml.HRef): 

  • ipython1/branches/ipython1-client-r3021/ipython1/external/twisted/web2/fileupload.py

    r2063 r3053  
    5151            line = defer.waitForDeferred(line) 
    5252            yield line 
    53             line = line.getResult() 
     53            line = line.get_result() 
    5454        #print "GOT", line 
    5555        if not line.endswith('\r\n'): 
    …… 
    177177            line = defer.waitForDeferred(line) 
    178178            yield line 
    179             line = line.getResult() 
     179            line = line.get_result() 
    180180        if line != self.boundary + '\r\n': 
    181181            raise MimeFormatError("Extra data before first boundary: %r looking for: %r" % (line, self.boundary + '\r\n')) 
    …… 
    192192            line = defer.waitForDeferred(line) 
    193193            yield line 
    194             line = line.getResult() 
     194            line = line.get_result() 
    195195         
    196196        if line == "--\r\n": 
    …… 
    255255            datas = defer.waitForDeferred(datas) 
    256256            yield datas 
    257             datas = datas.getResult() 
     257            datas = datas.get_result() 
    258258        if datas is None: 
    259259            break 
    …… 
    276276            x = defer.waitForDeferred(x) 
    277277            yield x 
    278             x = x.getResult() 
     278            x = x.get_result() 
    279279        if filename is None: 
    280280            # Is a normal form field 
    …… 
    345345            datas = defer.waitForDeferred(datas) 
    346346            yield datas 
    347             datas = datas.getResult() 
     347            datas = datas.get_result() 
    348348        if datas is None: 
    349349            break 

  • ipython1/branches/ipython1-client-r3021/ipython1/external/twisted/web2/stream.py

    r2063