Merge pull request #265 from M-griffin/master

Tetris and Weather Fixups

CHANGES

@@ -1,3 +1,11 @@
+2.0.11
+  - bugfix: weather.py fix incorrect postal code return from Accu Weather.
+    Changed the default to populate search by city/state instead of 
+    postal since this is no longer returned from accu weather correctly.
+    Also re-added missing save location field that was outside of 
+    while loop to funtion exit.
+  - bugfix: tetris.py fix for sending terminal font sequence prior to 
+    ansi screen display instead of after.
 2.0.10
   - bugfix: display updates when posting to oneliners, issue #235
 

x84/default/tetris.py

@@ -312,7 +312,7 @@ def echo(s):
     getch()
     # set syncterm font to cp437
     if term.kind.startswith('ansi'):
-        echo(syncterm_setfont('cp437'))
+        echo_unbuffered(syncterm_setfont('cp437'))
     artfile = os.path.join(os.path.dirname(__file__), 'art', 'tetris.ans')
     echo_unbuffered(u'\r\n' * term.height)  # cls
     if os.path.exists(artfile):

x84/default/weather.py

@@ -158,6 +158,7 @@ def do_search(term, search):
             disp_notfound()
         else:
             disp_found(len(locations))
+
     return locations
 
 
@@ -509,14 +510,15 @@ def main():
     while True:
         echo(u'\r\n\r\n')
         location = session.user.get('location', dict())
-        search = location.get('postal', u'')
+        search = location.get('city', u'') + ', ' + location.get('state', u'')
         disp_search_help()
         search = get_zipsearch(search)
         if search is None or 0 == len(search):
             # exit (no selection)
             return
 
         locations = do_search(term, search)
+
         if 0 != len(locations):
             location = (locations.pop() if 1 == len(locations)
                         else chose_location(locations) or dict())
@@ -552,6 +554,6 @@ def main():
                     get_centigrade()
                     break
                 elif inp.code == term.KEY_ENTER:
+                    chk_save_location(location)
                     return
 
-    chk_save_location(location)