Skip to content

Commit

Permalink
Merge pull request #2848 from dannon/typo_branch_230981
Browse files Browse the repository at this point in the history
Belated typo fixes for 1768
  • Loading branch information
nsoranzo committed Aug 24, 2016
2 parents 9de06e1 + eafa71f commit 93e74ca
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions lib/galaxy/web/framework/middleware/batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
dictionaries.
2. Each dictionary describes a single API call within the batch and is routed
back by the middleware to the application's `handle_request` as if it was
a seperate request.
a separate request.
3. Each response generated is combined into a final JSON list that is
returned from the POST call.
Expand Down Expand Up @@ -89,7 +89,7 @@ def process_batch_requests( self, batch_environ, start_response ):
continue

request_environ = self._build_request_environ( batch_environ, request )
response = self._proccess_batch_request( request, request_environ, start_response )
response = self._process_batch_request( request, request_environ, start_response )
responses.append( response )

batch_response_body = json.dumps( responses )
Expand Down Expand Up @@ -133,7 +133,8 @@ def _build_request_environ( self, original_environ, request ):
request_environ[ 'CONTENT_TYPE' ] = request.get( 'contentType', 'application/json' )
request_environ[ 'REQUEST_METHOD' ] = request.get( 'method', request.get( 'type', 'GET' ) )
url = '{0}://{1}{2}'.format( request_environ.get( 'wsgi.url_scheme' ),
request_environ.get( 'HTTP_HOST' ), request[ 'url' ] )
request_environ.get( 'HTTP_HOST' ),
request[ 'url' ] )
parsed = urlparse( url )
request_environ[ 'PATH_INFO' ] = parsed.path
request_environ[ 'QUERY_STRING' ] = parsed.query
Expand All @@ -149,7 +150,7 @@ def _build_request_environ( self, original_environ, request ):

return request_environ

def _proccess_batch_request( self, request, environ, start_response ):
def _process_batch_request( self, request, environ, start_response ):
# We may need to include middleware to record various reponses, but this way of doing that won't work:
# status, headers, body = self.application( environ, start_response, body_renderer=self.body_renderer )

Expand Down

0 comments on commit 93e74ca

Please sign in to comment.