Index: ftplib.py
===================================================================
--- ftplib.py	(revision 74276)
+++ ftplib.py	(working copy)
@@ -714,16 +714,18 @@
         self.__hosts = {}
         self.__macros = {}
         fp = open(filename, "r")
-        in_macro = 0
+        macro_lines = []
+        macro_name = None
         while 1:
             line = fp.readline()
             if not line: break
-            if in_macro and line.strip():
+            if macro_name and line.strip():
                 macro_lines.append(line)
                 continue
-            elif in_macro:
+            elif macro_name:
                 self.__macros[macro_name] = tuple(macro_lines)
-                in_macro = 0
+                macro_lines = []
+                macro_name = None
             words = line.split()
             host = user = passwd = acct = None
             default = 0
@@ -750,8 +752,6 @@
                     i = i + 1
                 elif w1 == 'macdef' and w2:
                     macro_name = w2
-                    macro_lines = []
-                    in_macro = 1
                     break
                 i = i + 1
             if default: