update

diff --git a/.travis.yml b/.travis.yml
index 3cc2b6c7e75fd57f0cef7bab86e56cd4e0ddc6c4..74ec8b1951c1eba583f83b05713af2a9feddf350 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,3 @@ env: HTTPBIN_URL=http://httpbin.org/
 script: make test
 install:
   - make test-deps
-  - pip install . --use-mirrors

diff --git a/requests/models.py b/requests/models.py
index 38572027601b7b2ab0bd9425e6aca763e14ad216..14094a6cddafde93c41f7da274fee87be980804e 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -190,7 +190,7 @@ class Request(RequestHooksMixin):
         return '<Request [%s]>' % (self.method)
 
     def prepare(self):
-        """Constructs a PreparedRequest and returns it."""
+        """Constructs a PreparedRequest for transmission and returns it."""
         p = PreparedRequest()
 
         p.prepare_method(self.method)

diff --git a/requirements.txt b/requirements.txt
index e44a472491ec26fb45ef6b97e4be555b0e31def0..657011a681ffd988f00c1b3ffaa19618dca25ddd 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-py.test
+pytest
 sphinx
\ No newline at end of file