Re: r252515 - in collective.simplesocial/trunk/collective/simplesocial: . browser likebutton
Encolpe Degoute <[email protected]>
| Newsgroups | gmane.comp.web.zope.plone.collective.cvs |
|---|---|
| Message-ID | <[email protected]> |
I've Oopsed! Sorry, I missed that one. Do you prefer a pull request or directly a commit ? Best regards Le 24/08/2013 17:16, David Glick (Plone) a écrit : > Thanks for the fixes, but you probably should do this at > https://github.com/collective/collective.simplesocial instead. > David > > On 8/24/13 12:43 AM, Encolpe Degoute wrote: >> Author: encolpe >> Date: Sat Aug 24 07:43:21 2013 >> New Revision: 252515 >> >> Modified: >> >> collective.simplesocial/trunk/collective/simplesocial/browser/image.py >> >> collective.simplesocial/trunk/collective/simplesocial/likebutton/likebutton.py >> >> collective.simplesocial/trunk/collective/simplesocial/likebutton/opengraph.py >> collective.simplesocial/trunk/collective/simplesocial/upgrades.py >> Log: >> Compatibility for Plone 4.3 >> >> Modified: >> collective.simplesocial/trunk/collective/simplesocial/browser/image.py >> ============================================================================== >> >> --- >> collective.simplesocial/trunk/collective/simplesocial/browser/image.py >> (original) >> +++ >> collective.simplesocial/trunk/collective/simplesocial/browser/image.py >> Sat Aug 24 07:43:21 2013 >> @@ -1,5 +1,8 @@ >> from zope.interface import implements >> -from zope.app.component.hooks import getSite >> +try: >> + from zope.component.hooks import getSite >> +except ImportError: >> + zope.app.component.hooks >> from collective.simplesocial.browser.interfaces import IFacebookImage >> class DefaultFacebookImage(object): >> >> Modified: >> collective.simplesocial/trunk/collective/simplesocial/likebutton/likebutton.py >> ============================================================================== >> >> --- >> collective.simplesocial/trunk/collective/simplesocial/likebutton/likebutton.py >> (original) >> +++ >> collective.simplesocial/trunk/collective/simplesocial/likebutton/likebutton.py >> Sat Aug 24 07:43:21 2013 >> @@ -1,4 +1,8 @@ >> -from zope.app.component.hooks import getSite >> + >> +try: >> + from zope.component.hooks import getSite >> +except ImportError: >> + zope.app.component.hooks >> from zope.interface import alsoProvides, noLongerProvides >> from Products.Five.browser import BrowserView >> from Products.Five.browser.pagetemplatefile import >> ViewPageTemplateFile >> >> Modified: >> collective.simplesocial/trunk/collective/simplesocial/likebutton/opengraph.py >> ============================================================================== >> >> --- >> collective.simplesocial/trunk/collective/simplesocial/likebutton/opengraph.py >> (original) >> +++ >> collective.simplesocial/trunk/collective/simplesocial/likebutton/opengraph.py >> Sat Aug 24 07:43:21 2013 >> @@ -1,4 +1,8 @@ >> -from zope.app.component.hooks import getSite >> + >> +try: >> + from zope.component.hooks import getSite >> +except ImportError: >> + zope.app.component.hooks >> from zope.component import queryMultiAdapter >> from zope.interface import implements >> from Products.Five.browser.pagetemplatefile import >> ViewPageTemplateFile >> >> Modified: >> collective.simplesocial/trunk/collective/simplesocial/upgrades.py >> ============================================================================== >> >> --- >> collective.simplesocial/trunk/collective/simplesocial/upgrades.py >> (original) >> +++ >> collective.simplesocial/trunk/collective/simplesocial/upgrades.py >> Sat Aug 24 07:43:21 2013 >> @@ -1,4 +1,8 @@ >> -from zope.app.component.hooks import getSite >> + >> +try: >> + from zope.component.hooks import getSite >> +except ImportError: >> + zope.app.component.hooks >> from zope.component import getUtility >> from Products.CMFCore.utils import getToolByName >> from Products.statusmessages.interfaces import IStatusMessage >> >> ------------------------------------------------------------------------------ >> >> Introducing Performance Central, a new site from SourceForge and >> AppDynamics. Performance Central is your source for news, insights, >> analysis and resources for efficient Application Performance Management. >> Visit us today! >> http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk >> >> _______________________________________________ >> Collective-checkins mailing list >> Collective-checkins-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org >> https://lists.sourceforge.net/lists/listinfo/collective-checkins > > -- Encolpe DEGOUTE http://encolpe.degoute.free.fr/ Logiciels libres, hockey sur glace et autres activités cérébrales ------------------------------------------------------------------------------ Introducing Performance Central, a new site from SourceForge and AppDynamics. Performance Central is your source for news, insights, analysis and resources for efficient Application Performance Management. Visit us today! http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk