Mercurial > feed2twitter

changeset 27:2b39038f25b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix
author Walter Cruz <walter@waltercruz.com>
date Mon, 05 Jan 2009 14:46:20 -0200
parents 279abdb9748f
children 569a8f40bb6b
files feed2twitter/MANIFEST.in feed2twitter/VERSION feed2twitter/feed2twitter.egg-info/PKG-INFO feed2twitter/feed2twitter.egg-info/SOURCES.txt feed2twitter/feed2twitter/__init__.py feed2twitter/setup.py
diffstat 6 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/feed2twitter/MANIFEST.in	Mon Jan 05 14:17:53 2009 -0200
+++ b/feed2twitter/MANIFEST.in	Mon Jan 05 14:46:20 2009 -0200
@@ -1,3 +1,3 @@
 include MANIFEST*
-include VERSION
+include VERSION*
 recursive-include docs *
--- a/feed2twitter/VERSION	Mon Jan 05 14:17:53 2009 -0200
+++ b/feed2twitter/VERSION	Mon Jan 05 14:46:20 2009 -0200
@@ -1,1 +1,1 @@
-0.6.1
\ No newline at end of file
+0.6.2
\ No newline at end of file
--- a/feed2twitter/feed2twitter.egg-info/PKG-INFO	Mon Jan 05 14:17:53 2009 -0200
+++ b/feed2twitter/feed2twitter.egg-info/PKG-INFO	Mon Jan 05 14:46:20 2009 -0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: feed2twitter
-Version: 0.5dev
+Version: 0.6.4dev
 Summary: Publish your feed items to twitter
 Home-page: http://www.assembla.com/spaces/feed2twitter
 Author: Walter Cruz
--- a/feed2twitter/feed2twitter.egg-info/SOURCES.txt	Mon Jan 05 14:17:53 2009 -0200
+++ b/feed2twitter/feed2twitter.egg-info/SOURCES.txt	Mon Jan 05 14:46:20 2009 -0200
@@ -1,5 +1,6 @@
 MANIFEST.in
 README
+VERSION
 setup.cfg
 setup.py
 docs/default.cfg.sample
--- a/feed2twitter/feed2twitter/__init__.py	Mon Jan 05 14:17:53 2009 -0200
+++ b/feed2twitter/feed2twitter/__init__.py	Mon Jan 05 14:46:20 2009 -0200
@@ -33,19 +33,13 @@
         self.items = items
         self.username = username
         self.passwd = passwd
-        from pkg_resources import resource_string
-        self.version = resource_string(__name__, '../VERSION')
+        self.version = __version__
         self.twApi = twitter.Api(username=self.username, password=self.passwd)
-        self.twApi.SetXTwitterHeaders('feed2twitter', 'http://www. assembla.com/spaces/feed2twitter', self.version)
-#        self.twApi.parameters['source'] = 'feed2twitter'
-#        self.twApi._request_headers['source'] = 'feed2twitter'
         self.set_attr_headers()
         self.rss = readrss.parse(url)
     
     def set_attr_headers(self):
-        return
-        self.api.SetUserAgent('"feed2twitter/0.2"')
-    
+        self.twApi.SetXTwitterHeaders('feed2twitter', 'http://www. assembla.com/spaces/feed2twitter', self.version)    
 
     def strip_tags(self,value):
         "Return the given HTML with all tags stripped."
@@ -151,3 +145,6 @@
             setattr(twitter.Api, PostUpdate.__name__, PostUpdate)
         feed2tw.update()
         time.sleep(interval)
+
+__version__ = '0.6.4'
+
--- a/feed2twitter/setup.py	Mon Jan 05 14:17:53 2009 -0200
+++ b/feed2twitter/setup.py	Mon Jan 05 14:46:20 2009 -0200
@@ -1,6 +1,11 @@
 from setuptools import setup, find_packages
 from pkg_resources import resource_string
-VERSION = resource_string(__name__, 'VERSION').strip()
+import os
+import re
+import sys
+
+v = file(os.path.join(os.path.dirname(__file__), 'feed2twitter', '__init__.py'))
+VERSION = re.compile(r".*__version__ = '(.*?)'", re.S).match(v.read()).group(1)
 
 setup(name='feed2twitter',
       version=VERSION,