Move imports before exports

Author: bd808

iptools/__init__.py

@@ -22,13 +22,6 @@
 # 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.
-__version__ = '0.7.0-dev'
-
-__all__ = (
-    'IpRange',
-    'IpRangeList',
-)
-
 
 # sniff for python2.x / python3k compatibility "fixes'
 try:
@@ -51,10 +44,16 @@ def next(iterable):
     Sequence = object
 # end compatibility "fixes'
 
-
 from . import ipv4
 from . import ipv6
 
+__version__ = '0.7.0-dev'
+
+__all__ = (
+    'IpRange',
+    'IpRangeList',
+)
+
 
 def _address2long(address):
     """

iptools/ipv4.py

@@ -23,6 +23,40 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import re
+
+# sniff for python2.x / python3k compatibility "fixes'
+try:
+    basestring = basestring
+except NameError:
+    # 'basestring' is undefined, must be python3k
+    basestring = str
+
+try:
+    bin = bin
+except NameError:
+    # builtin bin function doesn't exist
+    def bin(x):
+        """
+        From http://code.activestate.com/recipes/219300/#c7
+        """
+        if x < 0:
+            return '-' + bin(-x)
+        out = []
+        if x == 0:
+            out.append('0')
+        while x > 0:
+            out.append('01'[x & 1])
+            x >>= 1
+            pass
+        try:
+            return '0b' + ''.join(reversed(out))
+        except NameError:
+            out.reverse()
+            return '0b' + ''.join(out)
+    # end bin
+# end compatibility "fixes'
+
 __all__ = (
     'cidr2block',
     'hex2ip',
@@ -60,43 +94,6 @@
     'TEST_NET_3',
 )
 
-
-import re
-
-
-# sniff for python2.x / python3k compatibility "fixes'
-try:
-    basestring = basestring
-except NameError:
-    # 'basestring' is undefined, must be python3k
-    basestring = str
-
-try:
-    bin = bin
-except NameError:
-    # builtin bin function doesn't exist
-    def bin(x):
-        """
-        From http://code.activestate.com/recipes/219300/#c7
-        """
-        if x < 0:
-            return '-' + bin(-x)
-        out = []
-        if x == 0:
-            out.append('0')
-        while x > 0:
-            out.append('01'[x & 1])
-            x >>= 1
-            pass
-        try:
-            return '0b' + ''.join(reversed(out))
-        except NameError:
-            out.reverse()
-            return '0b' + ''.join(out)
-    # end bin
-# end compatibility "fixes'
-
-
 #: Regex for validating an IPv4 address
 _DOTTED_QUAD_RE = re.compile(r'^(\d{1,3}\.){0,3}\d{1,3}$')
 

iptools/ipv6.py

@@ -23,6 +23,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import re
+from . import ipv4
+
 __all__ = (
     'cidr2block',
     'ip2long',
@@ -52,11 +55,6 @@
     'UNSPECIFIED_ADDRESS',
 )
 
-
-import re
-from . import ipv4
-
-
 #: Regex for validating an IPv6 in hex notation
 _HEX_RE = re.compile(r'^([0-9a-f]{0,4}:){2,7}[0-9a-f]{0,4}$')