From 75353227531611c4eb6fdd12ee95a1e8eb1e96f5 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 13 Nov 2014 21:08:15 +0100 Subject: [PATCH 1/1] make zone.py top-level --- .gitignore | 1 + db.example.com.py | 2 +- zonemaker/zone.py => zone.py | 0 zone-maker => zonemaker | 2 +- zonemaker/__init__.py | 26 -------------------------- 5 files changed, 3 insertions(+), 28 deletions(-) rename zonemaker/zone.py => zone.py (100%) rename zone-maker => zonemaker (98%) delete mode 100644 zonemaker/__init__.py diff --git a/.gitignore b/.gitignore index af452c8..c07efa5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ __pycache__ +README.html *.srl diff --git a/db.example.com.py b/db.example.com.py index ad8f957..dc34985 100644 --- a/db.example.com.py +++ b/db.example.com.py @@ -1,4 +1,4 @@ -from zonemaker.zone import * +from zone import * # Our IP addresses; we have machine one and machine two. one4 = A("172.16.254.1") # for each record type, there's a corresponding class with the same name diff --git a/zonemaker/zone.py b/zone.py similarity index 100% rename from zonemaker/zone.py rename to zone.py diff --git a/zone-maker b/zonemaker similarity index 98% rename from zone-maker rename to zonemaker index 396a8b9..e852d92 100755 --- a/zone-maker +++ b/zonemaker @@ -27,7 +27,7 @@ # either expressed or implied, of the FreeBSD Project. import sys, os -from zonemaker.zone import Zone +from zone import Zone #import typing def load_module(name, path, write_bytecode = False): diff --git a/zonemaker/__init__.py b/zonemaker/__init__.py deleted file mode 100644 index 5736ef8..0000000 --- a/zonemaker/__init__.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2014, Ralf Jung -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation are those -# of the authors and should not be interpreted as representing official policies, -# either expressed or implied, of the FreeBSD Project. -- 2.30.2