Fixing demo runner: used to print empty newline at beginning of demo.

dhermes · dhermes · commit 4a99f8fafa18 · 2015-03-12T12:55:07.000-07:00
Also removing license from datastore demo.
diff --git a/gcloud/datastore/demo/demo.py b/gcloud/datastore/demo/demo.py
@@ -1,16 +1,3 @@
-# Copyright 2014 Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 # Welcome to the gCloud Datastore Demo! (hit enter)
 # We're going to walk through some of the basics...
 # Don't worry though. You don't need to do anything, just keep hitting enter...
diff --git a/gcloud/demo.py b/gcloud/demo.py
@@ -41,9 +41,11 @@ def from_module(cls, module):
     def run(self):
         line_groups = itertools.groupby(self.lines, self.get_line_type)
 
+        newline = False  # Don't use newline on the first statement.
         for group_type, lines in line_groups:
             if group_type == self.COMMENT:
-                self.write(lines)
+                self.write(lines, newline=newline)
+                newline = True
 
             elif group_type == self.CODE:
                 self.code(lines)
@@ -70,8 +72,8 @@ def _print(self, text='', newline=True):
         if newline:
             sys.stdout.write('\n')
 
-    def write(self, lines):
-        self._print()
+    def write(self, lines, newline=True):
+        self._print(newline=newline)
         self._print('\n'.join(lines), False)
         self.wait()
 
