Skip to content

Commit

Permalink
Merge pull request psf#806 from rhyselsmore/develop
Browse files Browse the repository at this point in the history
General Housekeeping
  • Loading branch information
Kenneth Reitz committed Aug 25, 2012
2 parents 4889adc + 29aa21a commit 390a4ae
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions NOTICE
@@ -1,4 +1,4 @@
Request includes some vendorized python libraries to ease installation.
Requests includes some vendorized python libraries to ease installation.

Urllib3 License
===============
Expand Down Expand Up @@ -113,4 +113,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1 change: 0 additions & 1 deletion tests/test_requests.py
Expand Up @@ -8,7 +8,6 @@
import os
sys.path.insert(0, os.path.abspath('..'))
import json
import os
import unittest
import pickle
import tempfile
Expand Down

0 comments on commit 390a4ae

Please sign in to comment.