diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-05-30 04:32:34 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-05-30 04:32:34 (GMT) |
| commit | 16e418b176592dd9be415f1bff68e88a975e9a44 (patch) | |
| tree | 105b651a1cc88681db096b35c7152ab1093e04b6 | |
| parent | d35e4619a5e9296f1e0270d332dd9d76efecaffe (diff) | |
| parent | 2b604d522f3bec0f61e0fc7bc5b1d3cfa6de450e (diff) | |
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
| -rw-r--r-- | TurtleArt/talogo.py | 1 | ||||
| -rw-r--r-- | TurtleArtActivity.py | 24 |
2 files changed, 16 insertions, 9 deletions
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py index 7e1361e..4aae737 100644 --- a/TurtleArt/talogo.py +++ b/TurtleArt/talogo.py @@ -62,7 +62,6 @@ class symbol: class logoerror(Exception): def __init__(self, value): - print value self.value = value def __str__(self): diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index 24ed3f6..d8a4a36 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -372,18 +372,26 @@ class TurtleArtActivity(activity.Activity): ''' Adjust the scrolled window position. ''' hadj = self.sw.get_hadjustment() hvalue = hadj.get_value() + dx - if hvalue < hadj.get_lower(): - hvalue = hadj.get_lower() - elif hvalue > hadj.get_upper(): - hvalue = hadj.get_upper() + try: + if hvalue < hadj.get_lower(): + hvalue = hadj.get_lower() + elif hvalue > hadj.get_upper(): + hvalue = hadj.get_upper() + except AttributeError: + _logger.debug( + 'get_lower, get_upper only available in PyGTK 2.14 and above.') hadj.set_value(hvalue) self.sw.set_hadjustment(hadj) vadj = self.sw.get_vadjustment() vvalue = vadj.get_value() + dy - if vvalue < vadj.get_lower(): - vvalue = vadj.get_lower() - elif vvalue > vadj.get_upper(): - vvalue = vadj.get_upper() + try: + if vvalue < vadj.get_lower(): + vvalue = vadj.get_lower() + elif vvalue > vadj.get_upper(): + vvalue = vadj.get_upper() + except AttributeError: + _logger.debug( + 'get_lower, get_upper only available in PyGTK 2.14 and above.') vadj.set_value(vvalue) self.sw.set_vadjustment(vadj) self._defer_palette_move = True |