summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2006-10-07 00:46:57 +0200
committerGuido Guenther <agx@bogon.sigxcpu.org>2006-10-07 00:46:57 +0200
commit7f8b254d551e31a2583a43ab3c0232b602ac7f4b (patch)
tree2894a603be949cc2cda485873bd1a91a7e6dc2fd
parent3a5f87f714a579c77c3057f58a2d1a02523bdb16 (diff)
parent9066be68b6b6d960b4f3f6cc8b56b35731f1b75a (diff)
Merge branch 'upstream'
-rw-r--r--PKG-INFO20
-rw-r--r--setup.cfg5
-rwxr-xr-xsetup.py2
-rw-r--r--src/vobject.egg-info/PKG-INFO20
-rw-r--r--src/vobject.egg-info/SOURCES.txt21
-rw-r--r--src/vobject.egg-info/dependency_links.txt1
-rw-r--r--src/vobject.egg-info/requires.txt1
-rw-r--r--src/vobject.egg-info/top_level.txt1
-rw-r--r--src/vobject.egg-info/zip-safe1
-rw-r--r--src/vobject/icalendar.py4
10 files changed, 75 insertions, 1 deletions
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..2b87954
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,20 @@
+Metadata-Version: 1.0
+Name: vobject
+Version: 0.4.3
+Summary: VObject: module for reading vCard and vCalendar files
+Home-page: http://vobject.skyhouseconsulting.com
+Author: Jeffrey Harris
+Author-email: jeffrey@osafoundation.org
+License: Apache
+Description: Parses iCalendar and vCard files into Python data structures, decoding the relevant encodings. Also serializes vobject data structures to valid iCalendar or vCard unicode strings.
+
+ Requires dateutil (https://moin.conectiva.com.br/DateUtil) 0.9 or later.
+Platform: any
+Classifier: Development Status :: 3 - Alpha
+Classifier: Environment :: Console
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Text Processing
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
index 3f79027..0ec0da6 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ from setuptools import setup, find_packages
# Metadata
PACKAGE_NAME = "vobject"
-PACKAGE_VERSION = "0.4.2"
+PACKAGE_VERSION = "0.4.3"
ALL_EXTS = ['*.py', '*.ics', '*.txt']
diff --git a/src/vobject.egg-info/PKG-INFO b/src/vobject.egg-info/PKG-INFO
new file mode 100644
index 0000000..2b87954
--- /dev/null
+++ b/src/vobject.egg-info/PKG-INFO
@@ -0,0 +1,20 @@
+Metadata-Version: 1.0
+Name: vobject
+Version: 0.4.3
+Summary: VObject: module for reading vCard and vCalendar files
+Home-page: http://vobject.skyhouseconsulting.com
+Author: Jeffrey Harris
+Author-email: jeffrey@osafoundation.org
+License: Apache
+Description: Parses iCalendar and vCard files into Python data structures, decoding the relevant encodings. Also serializes vobject data structures to valid iCalendar or vCard unicode strings.
+
+ Requires dateutil (https://moin.conectiva.com.br/DateUtil) 0.9 or later.
+Platform: any
+Classifier: Development Status :: 3 - Alpha
+Classifier: Environment :: Console
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Text Processing
diff --git a/src/vobject.egg-info/SOURCES.txt b/src/vobject.egg-info/SOURCES.txt
new file mode 100644
index 0000000..9daf1be
--- /dev/null
+++ b/src/vobject.egg-info/SOURCES.txt
@@ -0,0 +1,21 @@
+ACKNOWLEDGEMENTS.txt
+LICENSE.txt
+README.txt
+ez_setup.py
+setup.py
+src/vobject/__init__.py
+src/vobject/base.py
+src/vobject/behavior.py
+src/vobject/hcalendar.py
+src/vobject/icalendar.py
+src/vobject/vcard.py
+src/vobject/win32tz.py
+src/vobject.egg-info/PKG-INFO
+src/vobject.egg-info/SOURCES.txt
+src/vobject.egg-info/dependency_links.txt
+src/vobject.egg-info/requires.txt
+src/vobject.egg-info/top_level.txt
+src/vobject.egg-info/zip-safe
+tests/recurrence.ics
+tests/tests.py
+tests/utf8_test.ics
diff --git a/src/vobject.egg-info/dependency_links.txt b/src/vobject.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/vobject.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/src/vobject.egg-info/requires.txt b/src/vobject.egg-info/requires.txt
new file mode 100644
index 0000000..21aa035
--- /dev/null
+++ b/src/vobject.egg-info/requires.txt
@@ -0,0 +1 @@
+python-dateutil >= 1.1 \ No newline at end of file
diff --git a/src/vobject.egg-info/top_level.txt b/src/vobject.egg-info/top_level.txt
new file mode 100644
index 0000000..52a5040
--- /dev/null
+++ b/src/vobject.egg-info/top_level.txt
@@ -0,0 +1 @@
+vobject
diff --git a/src/vobject.egg-info/zip-safe b/src/vobject.egg-info/zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/vobject.egg-info/zip-safe
@@ -0,0 +1 @@
+
diff --git a/src/vobject/icalendar.py b/src/vobject/icalendar.py
index 728afb0..a51ff14 100644
--- a/src/vobject/icalendar.py
+++ b/src/vobject/icalendar.py
@@ -270,6 +270,10 @@ class TimezoneComponent(Component):
# try PyICU's tzid key
if hasattr(tzinfo, 'tzid'):
return tzinfo.tzid
+
+ # try pytz zone key
+ if hasattr(tzinfo, 'zone'):
+ return tzinfo.zone
# try tzical's tzid key
elif hasattr(tzinfo, '_tzid'):