Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

One last Charade reference to remove here. #1901

Merged
merged 1 commit into from

3 participants

@mjpieters

No description provided.

@Lukasa
Collaborator

This is an obvious :+1:. =D

@sigmavirus24
Collaborator

This amounts to essentially a documentation change. I don't see why it shouldn't be merged immediately (or as soon as the build passes).

@Lukasa
Collaborator

Looks like the CI server is having a tough time, I haven't seen any of these builds pass.

@sigmavirus24
Collaborator

It notifies people in IRC right? Freenode has been having some trouble since last night. It could be that the server is blocked trying to connect to IRC to notify of older jobs that have passed/failed.

@Lukasa
Collaborator

Anyway, the build is an irrelevance here.

@Lukasa Lukasa merged commit 15ac4e5 into kennethreitz:master

1 check was pending

default Merged build triggered.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 3, 2014
  1. @mjpieters
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 2 deletions.
  1. +1 −2  requests/models.py
View
3  requests/models.py
@@ -593,8 +593,7 @@ def ok(self):
@property
def apparent_encoding(self):
- """The apparent encoding, provided by the lovely Charade library
- (Thanks, Ian!)."""
+ """The apparent encoding, provided by the chardet library"""
return chardet.detect(self.content)['encoding']
def iter_content(self, chunk_size=1, decode_unicode=False):
Something went wrong with that request. Please try again.