Changeset 200

Timestamp:

09/03/09 04:09:29 (4 years ago)

Author:

tal

Message:

'as' is a reserved keyword in Python 2.6.

Location:

trunk

Files:

• Lib/robofab/interface/all/dialogs.py (modified) (2 diffs)
• Lib/robofab/objects/objectsFL.py (modified) (1 diff)
• Lib/robofab/objects/objectsRF.py (modified) (1 diff)
• Lib/robofab/test/test_psHints.py (modified) (1 diff)
• Scripts/RoboFabUFO/ImportChangedGlyphsFromUFO.py (modified) (1 diff)
• Scripts/RoboFabUFO/UpdateFromUFO.py (modified) (1 diff)

trunk/Lib/robofab/interface/all/dialogs.py

@@ -519 +519 @@
         """
         if inFontLab:
-                as = _FontLabDialogAskString(prompt, value, title)
-                as.Run()
-                v = as.value
+                askString = _FontLabDialogAskString(prompt, value, title)
+                askString.Run()
+                v = askString.value
                 if v is None:
                         return None
@@ -528 +528 @@
         elif MAC:
                 import EasyDialogs
-                as = EasyDialogs.AskString(prompt)
-                if as is None:
-                        return None
-                if len(as) == 0:
-                        return None
-                else:
-                        return as
+                askString = EasyDialogs.AskString(prompt)
+                if askString is None:
+                        return None
+                if len(askString) == 0:
+                        return None
+                else:
+                        return askString
         elif PC:
                 _raisePlatformError('GetString')

trunk/Lib/robofab/objects/objectsFL.py

@@ -667 +667 @@
                 return RGlyph(g)
         
-        def insertGlyph(self, glyph, as=None):
+        def insertGlyph(self, glyph, name=None):
                 """Returns a new glyph that has been inserted into the font.
-                as = another glyphname if you want to insert as with that."""
+                name = another glyphname if you want to insert as with that."""
                 from robofab.objects.objectsRF import RFont as _RFont
                 from robofab.objects.objectsRF import RGlyph as _RGlyph
                 oldGlyph = glyph
-                if as is None:
+                if name is None:
                         name = oldGlyph.name
-                else:
-                        name = as
                 # clear the destination glyph if it exists.
                 if self.has_key(name):

trunk/Lib/robofab/objects/objectsRF.py

@@ -510 +510 @@
                 return self.getGlyph(glyphName)
                 
-        def insertGlyph(self, glyph, as=None):
+        def insertGlyph(self, glyph, name=None):
                 """returns a new glyph that has been inserted into the font"""
-                if as is None:
+                if name is None:
                         name = glyph.name
-                else:
-                        name = as
                 glyph = glyph.copy()
                 glyph.name = name

trunk/Lib/robofab/test/test_psHints.py

@@ -99 +99 @@
                 True
 
-                >>> f.insertGlyph(g, as="new")
+                >>> f.insertGlyph(g, name="new")
                 <RGlyph for None.new>
                 >>> f["new"].psHints.asDict() == g.psHints.asDict()

trunk/Scripts/RoboFabUFO/ImportChangedGlyphsFromUFO.py

@@ -108 +108 @@
                 print "importing", name
                 self.vfb[name].clear()
-                self.vfb.insertGlyph(self.ufo[name], as=name)
+                self.vfb.insertGlyph(self.ufo[name], name=name)
                 self.vfb[name].width = self.ufo[name].width
                 self.vfb[name].note = self.ufo[name].note

trunk/Scripts/RoboFabUFO/UpdateFromUFO.py

@@ -108 +108 @@
                 print "importing", name
                 self.vfb[name].clear()
-                self.vfb.insertGlyph(self.ufo[name], as=name)
+                self.vfb.insertGlyph(self.ufo[name], name=name)
                 self.vfb[name].width = self.ufo[name].width
                 self.vfb[name].note = self.ufo[name].note