removed thirdparty modules pytz and pyparsing

Closes: lp#1077338

Removing included third party modules make it better to include Graphite into Debian.

MANIFEST.in

@@ -5,7 +5,6 @@ include check-dependencies.py
 include examples/*
 include conf/*.example
 include webapp/graphite/local_settings.py.example
-include webapp/graphite/thirdparty/pytz/pytz-LICENSE.txt
 recursive-include distro/ *
 recursive-include webapp/graphite/ *.html
 recursive-include webapp/content/ *

check-dependencies.py

@@ -64,6 +64,19 @@
   django = None
   fatal += 1
 
+# Test for pytz
+try:
+  import pytz
+except:
+  print "[FATAL] Unable to import the 'pytz' module, do you have pytz module installed for python %s?\n" % py_version
+  fatal += 1
+
+# Test for pyparsing
+try:
+  import pyparsing
+except:
+  print "[FATAL] Unable to import the 'pyparsing' module, do you have pyparsing module installed for python %s?\n" % py_version
+  fatal += 1
 
 # Test for django-tagging
 try:

requirements.txt

@@ -37,5 +37,6 @@ simplejson==2.1.6
 django-tagging==0.3.1
 gunicorn
 pytz
+pyparsing
 http://cairographics.org/releases/py2cairo-1.8.10.tar.gz
 git+git://github.com/graphite-project/whisper.git#egg=whisper

setup.cfg

@@ -13,6 +13,8 @@ requires = Django => 1.1.4
            python-simplejson
            python-sqlite2
            python-hashlib
+           pytz
+           pyparsing
 
 post-install = distro/redhat/misc/postinstall
 

setup.py

@@ -54,8 +54,6 @@
     'graphite.graphlot',
     'graphite.events',
     'graphite.version',
-    'graphite.thirdparty',
-    'graphite.thirdparty.pytz',
   ],
   package_data={'graphite' :
     ['templates/*', 'local_settings.py.example']},

webapp/graphite/cli/parser.py

@@ -12,7 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License."""
 
-from graphite.thirdparty.pyparsing import *
+from pyparsing import *
 
 grammar = Forward()
 

webapp/graphite/render/attime.py

@@ -16,11 +16,7 @@
 from time import daylight
 from django.conf import settings
 
-try: # See if there is a system installation of pytz first
-  import pytz
-except ImportError: # Otherwise we fall back to Graphite's bundled version
-  from graphite.thirdparty import pytz
-
+import pytz
 
 months = ['jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec']
 weekdays = ['sun','mon','tue','wed','thu','fri','sat']

webapp/graphite/render/glyph.py

@@ -22,10 +22,7 @@
 from graphite.util import json
 
 
-try: # See if there is a system installation of pytz first
-  import pytz
-except ImportError: # Otherwise we fall back to Graphite's bundled version
-  from graphite.thirdparty import pytz
+import pytz
 
 INFINITY = float('inf')
 

webapp/graphite/render/grammar.py

@@ -1,4 +1,4 @@
-from graphite.thirdparty.pyparsing import *
+from pyparsing import *
 
 ParserElement.enablePackrat()
 grammar = Forward()

webapp/graphite/settings.py

@@ -27,7 +27,6 @@
 WEB_DIR = dirname( abspath(__file__) )
 WEBAPP_DIR = dirname(WEB_DIR)
 GRAPHITE_ROOT = dirname(WEBAPP_DIR)
-THIRDPARTY_DIR = join(WEB_DIR,'thirdparty')
 # Initialize additional path variables
 # Defaults for these are set after local_settings is imported
 CONTENT_DIR = ''
@@ -47,8 +46,6 @@
 CLUSTER_SERVERS = []
 
 sys.path.insert(0, WEBAPP_DIR)
-# Allow local versions of the libs shipped in thirdparty to take precedence
-sys.path.append(THIRDPARTY_DIR)
 
 # Cluster settings
 CLUSTER_SERVERS = []