summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--appveyor.yml2
-rw-r--r--doc/unimplemented.rst2
-rw-r--r--python/curl/__init__.py2
-rw-r--r--setup.py2
-rw-r--r--src/easy.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 48b7055..b41ab3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -547,7 +547,7 @@ Version 7.19.5 [requires libcurl-7.21.2 or better] - 2014-07-12
* Added CURLE_NOT_BUILT_IN and CURLE_UNKNOWN_OPTION (libcurl 7.21.5+).
* Added CURL_SEEKFUNC_OK, CURL_SEEKFUNC_FAIL and
- CURL_SEEKFUNC_CANTSEEK. All contstants require libcurl 7.19.5+;
+ CURL_SEEKFUNC_CANTSEEK. All constants require libcurl 7.19.5+;
numeric values of CURL_SEEKFUNC_OK and CURL_SEEKFUNC_FAIL were
understood earlier but constants only exist as of libcurl 7.19.5.
@@ -1420,7 +1420,7 @@ Version 7.9.8.3
2002-07-16 Markus F.X.J. Oberhumer <mfx>
* Under Python 2.2 or better, Curl and CurlMulti objects now
- automatically participate in cyclic garbarge collection
+ automatically participate in cyclic garbage collection
(using the gc module).
diff --git a/appveyor.yml b/appveyor.yml
index e3b7d1f..13f7716 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
environment:
global:
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
- # /E:ON and /V:ON options are not enabled in the batch script intepreter
+ # /E:ON and /V:ON options are not enabled in the batch script interpreter
# See: http://stackoverflow.com/a/13751649/163740
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\.appveyor\\run_with_env.cmd"
# The pip version upgrade message on stderr causes appveyor to fail steps.
diff --git a/doc/unimplemented.rst b/doc/unimplemented.rst
index 1388507..9af7f17 100644
--- a/doc/unimplemented.rst
+++ b/doc/unimplemented.rst
@@ -55,7 +55,7 @@ Undocumented symbols
--------------------
Some symbols are present in libcurl's `symbols in versions`_ document but
-are not documented by libcurl. These symbols are not impemented by PycURL.
+are not documented by libcurl. These symbols are not implemented by PycURL.
As of this writing, the following symbols are thusly omitted:
diff --git a/python/curl/__init__.py b/python/curl/__init__.py
index 187913b..0c95e2b 100644
--- a/python/curl/__init__.py
+++ b/python/curl/__init__.py
@@ -1,7 +1,7 @@
'''A high-level interface to the pycurl extension'''
# ** mfx NOTE: the CGI class uses "black magic" using COOKIEFILE in
-# combination with a non-existant file name. See the libcurl docs
+# combination with a non-existent file name. See the libcurl docs
# for more info.
import sys, pycurl
diff --git a/setup.py b/setup.py
index 22d4c85..1428ee8 100644
--- a/setup.py
+++ b/setup.py
@@ -280,7 +280,7 @@ class ExtensionConfiguration(object):
# for hints as to which SSL library libcurl is linked against.
# More information: https://github.com/pycurl/pycurl/pull/147
#
- # The final point is we should link agaist the SSL library in use
+ # The final point is we should link against the SSL library in use
# even if libcurl does not tell us to, because *we* invoke functions
# in that SSL library. This means any SSL libraries found in
# --static-libs are forwarded to our libraries.
diff --git a/src/easy.c b/src/easy.c
index 0a37991..4fe6cee 100644
--- a/src/easy.c
+++ b/src/easy.c
@@ -348,7 +348,7 @@ do_curl_duphandle(CurlObject *self)
}
/* Checking for CURLE_OK is not required here.
- * All values have already been successfuly setopt'ed with self->handle. */
+ * All values have already been successfully setopt'ed with self->handle. */
/* Assign and incref python callback and update data pointers */
if (self->w_cb != NULL) {