From 92d8e724bfc8cd77c20dcb83cec74301938036d1 Mon Sep 17 00:00:00 2001
From: Dominik Pataky <git@netdecorator.org>
Date: Sat, 28 Oct 2017 17:34:55 +0200
Subject: [PATCH] Fix merge for Python3

---
 main.py  | 14 ++++++++++----
 setup.py | 11 +++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/main.py b/main.py
index 0af4786..4dba32a 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,14 @@
+#!/usr/bin/env python3
 import logging
 import argparse
 import sys
-import SocketServer
-from netflow.collector_v9 import ExportPacket
+import socketserver
+
+try:
+    from netflow.collector_v9 import ExportPacket
+except ImportError:
+    print("Netflow v9 not installed as package! Running from directory.")
+    from src.netflow.collector_v9 import ExportPacket
 
 logging.getLogger().setLevel(logging.INFO)
 ch = logging.StreamHandler(sys.stdout)
@@ -19,7 +25,7 @@ parser.add_argument('-cport', type=int, default=2055,
                     help='collector listener port')
 
 
-class SoftflowUDPHandler(SocketServer.BaseRequestHandler):
+class SoftflowUDPHandler(socketserver.BaseRequestHandler):
     # We need to save the templates our NetFlow device
     # send over time. Templates are not resended every
     # time a flow is sent to the collector.
@@ -28,7 +34,7 @@ class SoftflowUDPHandler(SocketServer.BaseRequestHandler):
     @classmethod
     def get_server(cls, host, port):
         logging.info("Listening on interface {}:{}".format(host, port))
-        server = SocketServer.UDPServer((host, port), cls)
+        server = socketserver.UDPServer((host, port), cls)
         return server
 
     def handle(self):
diff --git a/setup.py b/setup.py
index c954cec..c800c41 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from setuptools import setup, find_packages
 import os
 
-
 data_files = [(d, [os.path.join(d, f) for f in files])
               for d, folders, files in os.walk(os.path.join('src', 'config'))]
 
-setup(name='python-netflow-v9-softflowd',
-      version='1.0',
+setup(name='netflow-v9',
+      version='0.5',
       description='NetFlow v9 parser and collector implemented in Python 3. Developed to be used with softflowd v0.9.9',
-      author='coox',
-      author_email='gro.rotarocedten@mod',
+      author='Dominik Pataky',
+      author_email='dom@netdecorator.org',
       packages=find_packages('src'),
       package_dir={'': 'src'},
 )