Merge changes from upstream

1 files changed, 8 insertions, 7 deletions

diff --git a/gerber/excellon.py b/gerber/excellon.py
index 780d08f..9d09576 100755
--- a/gerber/excellon.py
+++ b/gerber/excellon.py
@@ -1,8 +1,8 @@
-#! /usr/bin/env python

+#!/usr/bin/env python

 # -*- coding: utf-8 -*-

 

-# copyright 2014 Hamilton Kibbe <ham@hamiltonkib.be>

-#

+# Copyright 2014 Hamilton Kibbe <ham@hamiltonkib.be>

+
 # 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

@@ -13,7 +13,8 @@
 # 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.

+# limitations under the License.
+
 """

 Excellon File module

 ====================

@@ -124,7 +125,7 @@ class ExcellonParser(object):
         self.tools = {}

         self.hits = []

         self.active_tool = None

-        self.pos = [0., 0.]

+        self.pos = [0., 0.]
         if settings is not None:

             self.units = settings.units

             self.zero_suppression = settings.zero_suppression

@@ -234,7 +235,7 @@ class ExcellonParser(object):
             stmt = CoordinateStmt.from_excellon(line, fmt, zs)

             x = stmt.x

             y = stmt.y

-            self.statements.append(stmt)

+            self.statements.append(stmt)
             if self.notation == 'absolute':

                 if x is not None:

                     self.pos[0] = x

@@ -245,7 +246,7 @@ class ExcellonParser(object):
                     self.pos[0] += x

                 if y is not None:

                     self.pos[1] += y

-            if self.state == 'DRILL':

+            if self.state == 'DRILL':
                 self.hits.append((self.active_tool, tuple(self.pos)))

                 self.active_tool._hit()

         else: