From 8335a8e4c8ce3953bafef5a10f25c2c31b735aaa Mon Sep 17 00:00:00 2001
From: Vincent Jacques <vincent@vincent-jacques.net>
Date: Sat, 8 Sep 2012 11:18:56 +0200
Subject: [PATCH] Small no-impact code improvements

---
 github/Repository.py |  2 +-
 github/Requester.py  | 17 ++++++++---------
 test/Framework.py    | 16 +++++-----------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/github/Repository.py b/github/Repository.py
index 05c2e5f9..3b6701ab 100644
--- a/github/Repository.py
+++ b/github/Repository.py
@@ -1060,7 +1060,7 @@ class Repository( GithubObject.GithubObject ):
         headers, data = self._requester.requestAndCheck(
             "GET",
             "/legacy/issues/search/" + self.owner.login + "/" + self.name + "/" + state + "/" + urllib.quote( keyword ),
-            {},
+            None,
             None
         )
         return [
diff --git a/github/Requester.py b/github/Requester.py
index 680ed417..72416785 100644
--- a/github/Requester.py
+++ b/github/Requester.py
@@ -65,21 +65,20 @@ class Requester:
 
     def requestRaw( self, verb, url, parameters, input ):
         assert verb in [ "HEAD", "GET", "POST", "PATCH", "PUT", "DELETE" ]
-        
+
         #URLs generated locally will be relative to __base_url
         #URLs returned from the server will start with __base_url
         if url.startswith( self.__base_url ):
             url = url[ len(self.__base_url): ]
-        elif url.startswith( "/" ):
-            url = url
         else:
-            assert( False ) #pragma no cover
-        
+            assert url.startswith( "/" )
+        url = self.__prefix + url
+
         headers = dict()
         if self.__authorizationHeader is not None:
             headers[ "Authorization" ] = self.__authorizationHeader
 
-        cnx = self.__connectionClass( host = self.__hostname, port = self.__port, strict = True, timeout= self.__timeout )
+        cnx = self.__connectionClass( host = self.__hostname, port = self.__port, strict = True, timeout = self.__timeout )
         cnx.request(
             verb,
             self.__completeUrl( url, parameters ),
@@ -97,14 +96,14 @@ class Requester:
         if "x-ratelimit-remaining" in headers and "x-ratelimit-limit" in headers:
             self.rate_limiting = ( int( headers[ "x-ratelimit-remaining" ] ), int( headers[ "x-ratelimit-limit" ] ) )
 
-        # print verb, url, parameters, input, "==>", status, str( headers )[ :30 ], str( output )[ :30 ]
+        # print verb, self.__base_url + url, parameters, input, "==>", status, str( headers ), str( output )
         return status, headers, output
 
     def __completeUrl( self, url, parameters ):
         if parameters is None or len( parameters ) == 0:
-            return self.__prefix + url
+            return url
         else:
-            return self.__prefix + url + "?" + urllib.urlencode( parameters )
+            return url + "?" + urllib.urlencode( parameters )
 
     def __structuredFromJson( self, data ):
         if len( data ) == 0:
diff --git a/test/Framework.py b/test/Framework.py
index f41d1592..597c64e1 100644
--- a/test/Framework.py
+++ b/test/Framework.py
@@ -40,7 +40,7 @@ def fixAuthorizationHeader( headers ):
         elif headers[ "Authorization" ].startswith( "Basic " ):
             headers[ "Authorization" ] = "Basic login_and_password_removed"
         else:
-            del headers[ "Authorization" ] # Do not let sensitive info in git :-p
+            assert False
 
 class RecordingConnection:
     def __init__( self, file, protocol, host, port, *args, **kwds ):
@@ -147,8 +147,9 @@ class BasicTestCase( unittest.TestCase ):
 
     def __openFile( self, mode ):
         for ( _, _, functionName, _ ) in traceback.extract_stack():
-            if functionName.startswith( "test" ) and functionName != "test" or functionName == "setUp" or functionName == "tearDown":
-                fileName = os.path.join( os.path.dirname( __file__ ), "ReplayData", self.__class__.__name__ + "." + functionName + ".txt" )
+            if functionName.startswith( "test" ) or functionName == "setUp" or functionName == "tearDown":
+                if functionName != "test": # because in class Hook( Framework.TestCase ), method testTest calls Hook.test
+                    fileName = os.path.join( os.path.dirname( __file__ ), "ReplayData", self.__class__.__name__ + "." + functionName + ".txt" )
         if fileName != self.__fileName:
             self.__closeReplayFileIfNeeded()
             self.__fileName = fileName
@@ -166,14 +167,7 @@ class BasicTestCase( unittest.TestCase ):
         self.assertEqual( realKeys, expectedKeys )
 
     def assertListKeyBegin( self, elements, key, expectedKeys ):
-        def take( sequence, length ):
-            taken = list()
-            for element in elements:
-                taken.append( element )
-                if len( taken ) >= length:
-                    break
-            return taken
-        realKeys = [ key( element ) for element in take( elements, len( expectedKeys ) ) ]
+        realKeys = [ key( element ) for element in elements[ : len( expectedKeys ) ] ]
         self.assertEqual( realKeys, expectedKeys )
 
 class TestCase( BasicTestCase ):