summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Lib/plat-freebsd7/IN.py8
-rw-r--r--Lib/test/test_enumerate.py2
-rw-r--r--Lib/test/test_urllib2.py2
-rw-r--r--Lib/urllib2.py8
-rw-r--r--Mac/Modules/file/filesupport.py76
-rw-r--r--Tools/bgen/bgen/scantools.py10
6 files changed, 53 insertions, 53 deletions
diff --git a/Lib/plat-freebsd7/IN.py b/Lib/plat-freebsd7/IN.py
index eb55a87..77314ac 100644
--- a/Lib/plat-freebsd7/IN.py
+++ b/Lib/plat-freebsd7/IN.py
@@ -23,13 +23,13 @@ __CC_SUPPORTS_WARNING = 1
__CC_SUPPORTS_VARADIC_XXX = 1
__CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1
__CC_INT_IS_32BIT = 1
-def __P(protos): return protos
+def __P(protos): return protos
-def __STRING(x): return #x
+def __STRING(x): return #x
-def __XSTRING(x): return __STRING(x)
+def __XSTRING(x): return __STRING(x)
-def __P(protos): return ()
+def __P(protos): return ()
def __STRING(x): return "x"
diff --git a/Lib/test/test_enumerate.py b/Lib/test/test_enumerate.py
index 0a88e8d..b6a18ee 100644
--- a/Lib/test/test_enumerate.py
+++ b/Lib/test/test_enumerate.py
@@ -193,7 +193,7 @@ class TestReversed(unittest.TestCase):
else:
self.fail("non-callable __reversed__ didn't raise!")
self.assertEqual(rc, sys.getrefcount(r))
-
+
def test_main(verbose=None):
testclasses = (EnumerateTestCase, SubclassTestCase, TestEmpty, TestBig,
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 1c0b7da..b07fd36 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -40,7 +40,7 @@ class TrivialTests(unittest.TestCase):
buf = f.read()
f.close()
-
+
def test_statudict(self):
# test the new-in-2.5 httpresponses dictionary
self.assertEquals(urllib2.httpresponses[404], "Not Found")
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 7202507..e9fb396 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -1298,7 +1298,7 @@ class OpenerFactory:
httpresponses = {
100: 'Continue',
101: 'Switching Protocols',
-
+
200: 'OK',
201: 'Created',
202: 'Accepted',
@@ -1306,7 +1306,7 @@ httpresponses = {
204: 'No Content',
205: 'Reset Content',
206: 'Partial Content',
-
+
300: 'Multiple Choices',
301: 'Moved Permanently',
302: 'Found',
@@ -1315,7 +1315,7 @@ httpresponses = {
305: 'Use Proxy',
306: '(Unused)',
307: 'Temporary Redirect',
-
+
400: 'Bad Request',
401: 'Unauthorized',
402: 'Payment Required',
@@ -1334,7 +1334,7 @@ httpresponses = {
415: 'Unsupported Media Type',
416: 'Requested Range Not Satisfiable',
417: 'Expectation Failed',
-
+
500: 'Internal Server Error',
501: 'Not Implemented',
502: 'Bad Gateway',
diff --git a/Mac/Modules/file/filesupport.py b/Mac/Modules/file/filesupport.py
index a6ac536..d0e88f0 100644
--- a/Mac/Modules/file/filesupport.py
+++ b/Mac/Modules/file/filesupport.py
@@ -205,44 +205,44 @@ PyMac_BuildHFSUniStr255(HFSUniStr255 *itself)
static OSErr
_PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
{
- FSRef fsr;
- OSErr err;
-
- *path = '\0';
- err = FSpMakeFSRef(fss, &fsr);
- if (err == fnfErr) {
- /* FSSpecs can point to non-existing files, fsrefs can't. */
- FSSpec fss2;
- int tocopy;
-
- err = FSMakeFSSpec(fss->vRefNum, fss->parID, "", &fss2);
- if (err)
- return err;
- err = FSpMakeFSRef(&fss2, &fsr);
- if (err)
- return err;
- err = (OSErr)FSRefMakePath(&fsr, path, len-1);
- if (err)
- return err;
- /* This part is not 100% safe: we append the filename part, but
- ** I'm not sure that we don't run afoul of the various 8bit
- ** encodings here. Will have to look this up at some point...
- */
- strcat(path, "/");
- tocopy = fss->name[0];
- if ((strlen(path) + tocopy) >= len)
- tocopy = len - strlen(path) - 1;
- if (tocopy > 0)
- strncat(path, fss->name+1, tocopy);
- }
- else {
- if (err)
- return err;
- err = (OSErr)FSRefMakePath(&fsr, path, len);
- if (err)
- return err;
- }
- return 0;
+ FSRef fsr;
+ OSErr err;
+
+ *path = '\0';
+ err = FSpMakeFSRef(fss, &fsr);
+ if (err == fnfErr) {
+ /* FSSpecs can point to non-existing files, fsrefs can't. */
+ FSSpec fss2;
+ int tocopy;
+
+ err = FSMakeFSSpec(fss->vRefNum, fss->parID, "", &fss2);
+ if (err)
+ return err;
+ err = FSpMakeFSRef(&fss2, &fsr);
+ if (err)
+ return err;
+ err = (OSErr)FSRefMakePath(&fsr, path, len-1);
+ if (err)
+ return err;
+ /* This part is not 100% safe: we append the filename part, but
+ ** I'm not sure that we don't run afoul of the various 8bit
+ ** encodings here. Will have to look this up at some point...
+ */
+ strcat(path, "/");
+ tocopy = fss->name[0];
+ if ((strlen(path) + tocopy) >= len)
+ tocopy = len - strlen(path) - 1;
+ if (tocopy > 0)
+ strncat(path, fss->name+1, tocopy);
+ }
+ else {
+ if (err)
+ return err;
+ err = (OSErr)FSRefMakePath(&fsr, path, len);
+ if (err)
+ return err;
+ }
+ return 0;
}
"""
diff --git a/Tools/bgen/bgen/scantools.py b/Tools/bgen/bgen/scantools.py
index aea43ea..d809a65 100644
--- a/Tools/bgen/bgen/scantools.py
+++ b/Tools/bgen/bgen/scantools.py
@@ -374,7 +374,7 @@ if missing: raise "Missing Types"
tmp = self.scanmine and self.scanfile
self.scanfile = None
if tmp: tmp.close()
-
+
def closehtml(self):
if self.htmlfile: self.htmlfile.write(ENDHTMLREPORT)
tmp = self.htmlmine and self.htmlfile
@@ -415,7 +415,7 @@ if missing: raise "Missing Types"
self.htmlfile = file
self.htmlmine = mine
self.htmlfile.write(BEGINHTMLREPORT)
-
+
def openoutput(self, filename):
try:
file = open(filename, 'w')
@@ -728,10 +728,10 @@ if missing: raise "Missing Types"
classname, listname = self.destination(tp, name, arglist, modifiers)
else:
classname, listname = self.destination(tp, name, arglist)
- if not classname or not listname:
+ if not classname or not listname:
self.htmlreport("*** no output generated: self.destination() returned None", klass="blacklisted")
return
- if not self.specfile:
+ if not self.specfile:
self.htmlreport("*** no output generated: no output file specified", klass="blacklisted")
return
self.specfile.write("f = %s(%s, %r,\n" % (classname, tp, name))
@@ -800,7 +800,7 @@ if missing: raise "Missing Types"
if not line or line[-1] != '\n':
oline += '\n'
self.htmlfile.write(oline)
-
+
class Scanner_PreUH3(Scanner):
"""Scanner for Universal Headers before release 3"""
def initpatterns(self):
generated by cgit v0.12 at 2024-11-23 10:46:12 (GMT)